* [Buildroot] svn commit: trunk/buildroot/package/x11r7/pixman
@ 2008-03-06 18:48 ninevoltz at uclibc.org
0 siblings, 0 replies; 3+ messages in thread
From: ninevoltz at uclibc.org @ 2008-03-06 18:48 UTC (permalink / raw)
To: buildroot
Author: ninevoltz
Date: 2008-03-06 10:48:43 -0800 (Thu, 06 Mar 2008)
New Revision: 21250
Log:
fixed pixman install
Modified:
trunk/buildroot/package/x11r7/pixman/pixman.mk
Changeset:
Modified: trunk/buildroot/package/x11r7/pixman/pixman.mk
===================================================================
--- trunk/buildroot/package/x11r7/pixman/pixman.mk 2008-03-06 18:46:36 UTC (rev 21249)
+++ trunk/buildroot/package/x11r7/pixman/pixman.mk 2008-03-06 18:48:43 UTC (rev 21250)
@@ -10,6 +10,8 @@
PIXMAN_AUTORECONF = NO
PIXMAN_INSTALL_STAGING = YES
PIXMAN_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install-data
+PIXMAN_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install install-data
+
PIXMAN_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_dmxproto
$(eval $(call AUTOTARGETS,package/x11r7,pixman))
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/x11r7/pixman
@ 2008-05-01 19:03 ninevoltz at uclibc.org
0 siblings, 0 replies; 3+ messages in thread
From: ninevoltz at uclibc.org @ 2008-05-01 19:03 UTC (permalink / raw)
To: buildroot
Author: ninevoltz
Date: 2008-05-01 12:03:48 -0700 (Thu, 01 May 2008)
New Revision: 21912
Log:
remove libdir-la.patch, handled by Makefile.autotools.in
Removed:
trunk/buildroot/package/x11r7/pixman/pixman-0.9.6-libdir-la.patch
Changeset:
Deleted: trunk/buildroot/package/x11r7/pixman/pixman-0.9.6-libdir-la.patch
===================================================================
--- trunk/buildroot/package/x11r7/pixman/pixman-0.9.6-libdir-la.patch 2008-05-01 19:01:10 UTC (rev 21911)
+++ trunk/buildroot/package/x11r7/pixman/pixman-0.9.6-libdir-la.patch 2008-05-01 19:03:48 UTC (rev 21912)
@@ -1,77 +0,0 @@
---- libdaemon/ltmain.sh.orig 2004-11-23 09:19:19.000000000 -0700
-+++ libdaemon/ltmain.sh 2007-01-13 14:36:53.000000000 -0700
-@@ -231,8 +231,9 @@
- # line option must be used.
- if test -z "$tagname"; then
- $echo "$modename: unable to infer tagged configuration"
-- $echo "$modename: specify a tag with \`--tag'" 1>&2
-- exit $EXIT_FAILURE
-+ $echo "$modename: defaulting to \`CC'"
-+ $echo "$modename: if this is not correct, specify a tag with \`--tag'"
-+# exit $EXIT_FAILURE
- # else
- # $echo "$modename: using $tagname tagged configuration"
- fi
-@@ -2279,8 +2280,14 @@
- absdir="$abs_ladir"
- libdir="$abs_ladir"
- else
-- dir="$libdir"
-- absdir="$libdir"
-+ # Adding 'libdir' from the .la file to our library search paths
-+ # breaks crosscompilation horribly. We cheat here and don't add
-+ # it, instead adding the path where we found the .la. -CL
-+ dir="$abs_ladir"
-+ absdir="$abs_ladir"
-+ libdir="$abs_ladir"
-+ #dir="$libdir"
-+ #absdir="$libdir"
- fi
- else
- if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-@@ -2754,6 +2761,16 @@
- esac
- if grep "^installed=no" $deplib > /dev/null; then
- path="$absdir/$objdir"
-+# This interferes with crosscompilation. -CL
-+# else
-+# eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+# if test -z "$libdir"; then
-+# $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-+# exit 1
-+# fi
-+# if test "$absdir" != "$libdir"; then
-+# $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-+# fi
- else
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- if test -z "$libdir"; then
-@@ -5141,6 +5158,10 @@
- # Replace all uninstalled libtool libraries with the installed ones
- newdependency_libs=
- for deplib in $dependency_libs; do
-+ # Replacing uninstalled with installed can easily break crosscompilation,
-+ # since the installed path is generally the wrong architecture. -CL
-+ newdependency_libs="$newdependency_libs $deplib"
-+ continue
- case $deplib in
- *.la)
- name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-@@ -5459,10 +5480,13 @@
- # At present, this check doesn't affect windows .dll's that
- # are installed into $libdir/../bin (currently, that works fine)
- # but it's something to keep an eye on.
-- if test "$inst_prefix_dir" = "$destdir"; then
-- $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-- exit $EXIT_FAILURE
-- fi
-+ #
-+ # This breaks install into our staging area. -PB
-+ #
-+ # if test "$inst_prefix_dir" = "$destdir"; then
-+ # $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-+ # exit $EXIT_FAILURE
-+ # fi
-
- if test -n "$inst_prefix_dir"; then
- # Stick the inst_prefix_dir data into the link command.
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/x11r7/pixman
@ 2008-06-30 13:00 jacmet at uclibc.org
0 siblings, 0 replies; 3+ messages in thread
From: jacmet at uclibc.org @ 2008-06-30 13:00 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-06-30 06:00:18 -0700 (Mon, 30 Jun 2008)
New Revision: 22566
Log:
pixman: bump version
Based on googlecode r507 by Arnar Mar Sigurdsson.
Added:
trunk/buildroot/package/x11r7/pixman/pixman-0.10.0-no-tests.patch
Removed:
trunk/buildroot/package/x11r7/pixman/pixman-0.9.6-no-tests.patch
Modified:
trunk/buildroot/package/x11r7/pixman/pixman.mk
Changeset:
Added: trunk/buildroot/package/x11r7/pixman/pixman-0.10.0-no-tests.patch
===================================================================
--- trunk/buildroot/package/x11r7/pixman/pixman-0.10.0-no-tests.patch (rev 0)
+++ trunk/buildroot/package/x11r7/pixman/pixman-0.10.0-no-tests.patch 2008-06-30 13:00:18 UTC (rev 22566)
@@ -0,0 +1,11 @@
+--- a/Makefile.in.orig 2008-05-23 14:04:37.000000000 +0000
++++ b/Makefile.in 2008-05-23 14:04:50.000000000 +0000
+@@ -198,7 +198,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = pixman test
++SUBDIRS = pixman
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = pixman-1.pc
+ USERNAME = $$USER
Deleted: trunk/buildroot/package/x11r7/pixman/pixman-0.9.6-no-tests.patch
===================================================================
--- trunk/buildroot/package/x11r7/pixman/pixman-0.9.6-no-tests.patch 2008-06-30 12:55:29 UTC (rev 22565)
+++ trunk/buildroot/package/x11r7/pixman/pixman-0.9.6-no-tests.patch 2008-06-30 13:00:18 UTC (rev 22566)
@@ -1,11 +0,0 @@
---- a/Makefile.in.orig 2008-01-30 12:56:25.000000000 -0500
-+++ b/Makefile.in 2008-01-30 12:56:38.000000000 -0500
-@@ -198,7 +198,7 @@ sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--SUBDIRS = pixman test
-+SUBDIRS = pixman
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = pixman-1.pc
- RELEASE_OR_SNAPSHOT = $$(if test "x$(CAIRO_VERSION_MINOR)" = "x$$(echo "$(CAIRO_VERSION_MINOR)/2*2" | bc)" ; then echo release; else echo snapshot; fi)
Modified: trunk/buildroot/package/x11r7/pixman/pixman.mk
===================================================================
--- trunk/buildroot/package/x11r7/pixman/pixman.mk 2008-06-30 12:55:29 UTC (rev 22565)
+++ trunk/buildroot/package/x11r7/pixman/pixman.mk 2008-06-30 13:00:18 UTC (rev 22566)
@@ -4,7 +4,7 @@
#
################################################################################
-PIXMAN_VERSION = 0.9.6
+PIXMAN_VERSION = 0.10.0
PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.gz
PIXMAN_SITE = http://cairographics.org/releases/
PIXMAN_AUTORECONF = NO
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-06-30 13:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-05-01 19:03 [Buildroot] svn commit: trunk/buildroot/package/x11r7/pixman ninevoltz at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2008-06-30 13:00 jacmet at uclibc.org
2008-03-06 18:48 ninevoltz at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox