diff options
Diffstat (limited to 'package/cairo')
| -rw-r--r-- | package/cairo/cairo.mk | 35 | ||||
| -rw-r--r-- | package/cairo/libdir-la.patch | 77 |
2 files changed, 89 insertions, 23 deletions
diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index 7e1eba5c6..7259c296a 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -30,7 +30,6 @@ $(CAIRO_DIR)/.unpacked: $(DL_DIR)/$(CAIRO_SOURCE) $(CAIRO_DIR)/.configured: $(CAIRO_DIR)/.unpacked (cd $(CAIRO_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ - PKG_CONFIG=$(STAGING_DIR)/usr/bin/pkg-config \ ac_cv_c_bigendian=$(CAIRO_BE) \ ac_cv_func_posix_getpwuid_r=yes \ glib_cv_stack_grows=no \ @@ -90,25 +89,26 @@ $(CAIRO_DIR)/.configured: $(CAIRO_DIR)/.unpacked gl_cv_c_restrict=no \ ac_cv_path_GLIB_GENMARSHAL=/usr/bin/glib-genmarshal \ ./configure \ - --host=$(REAL_GNU_TARGET_NAME) \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ - --prefix=$(STAGING_DIR) \ - --exec_prefix=$(STAGING_DIR) \ - --libdir=$(STAGING_DIR)/lib \ - --includedir=$(STAGING_DIR)/include \ + --prefix=/usr \ + --exec-prefix=/usr \ --bindir=/usr/bin \ --sbindir=/usr/sbin \ + --libdir=/lib \ --libexecdir=/usr/lib \ --sysconfdir=/etc \ --datadir=/usr/share \ --localstatedir=/var \ + --includedir=/include \ --mandir=/usr/man \ --infodir=/usr/info \ --enable-shared \ --enable-static \ --with-x \ - --x-includes=$(STAGING_DIR)/usr/X11R6/include \ - --x-libraries=$(STAGING_DIR)/usr/X11R6/lib \ + --x-includes=$(STAGING_DIR)/include \ + --x-libraries=$(STAGING_DIR)/lib \ --enable-ps=yes \ --enable-pdf=yes \ --enable-svg=no \ @@ -124,21 +124,10 @@ $(CAIRO_DIR)/src/.libs/$(CAIRO_BINARY): $(CAIRO_DIR)/.configured touch -c $(CAIRO_DIR)/src/.libs/$(CAIRO_BINARY) $(STAGING_DIR)/lib/$(CAIRO_BINARY): $(CAIRO_DIR)/src/.libs/$(CAIRO_BINARY) - $(MAKE) prefix=$(STAGING_DIR) \ - exec_prefix=$(STAGING_DIR) \ - bindir=$(STAGING_DIR)/bin \ - sbindir=$(STAGING_DIR)/sbin \ - libexecdir=$(STAGING_DIR)/libexec \ - datadir=$(STAGING_DIR)/share \ - sysconfdir=$(STAGING_DIR)/etc \ - sharedstatedir=$(STAGING_DIR)/com \ - localstatedir=$(STAGING_DIR)/var \ - libdir=$(STAGING_DIR)/lib \ - includedir=$(STAGING_DIR)/include \ - oldincludedir=$(STAGING_DIR)/include \ - infodir=$(STAGING_DIR)/info \ - mandir=$(STAGING_DIR)/man \ - -C $(CAIRO_DIR) install; + $(MAKE) DESTDIR=$(STAGING_DIR) -C $(CAIRO_DIR) install; + $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" $(STAGING_DIR)/lib/libcairo.la + $(SED) "s, x11 ,,g" $(STAGING_DIR)/lib/pkgconfig/cairo.pc + $(SED) "s, x11 ,,g" $(STAGING_DIR)/lib/pkgconfig/cairo-xlib.pc touch -c $(STAGING_DIR)/lib/$(CAIRO_BINARY) $(TARGET_DIR)/lib/libcairo.so.2.9.3: $(STAGING_DIR)/lib/$(CAIRO_BINARY) diff --git a/package/cairo/libdir-la.patch b/package/cairo/libdir-la.patch new file mode 100644 index 000000000..c352997d6 --- /dev/null +++ b/package/cairo/libdir-la.patch @@ -0,0 +1,77 @@ +--- cairo/ltmain.sh.orig 2004-11-23 09:19:19.000000000 -0700 ++++ cairo/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. |