From 58aaf754815926de90a90f16101999d7d2b03f8a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 16 Mar 2009 20:58:04 +0000 Subject: expat: convert to Makefile.autotools.in format --- package/expat/expat-libdir-la.patch | 77 ++++++++++++++++++++++++++++++++++ package/expat/expat.mk | 83 +++++++------------------------------ package/expat/libdir-la.patch | 77 ---------------------------------- 3 files changed, 91 insertions(+), 146 deletions(-) create mode 100644 package/expat/expat-libdir-la.patch delete mode 100644 package/expat/libdir-la.patch diff --git a/package/expat/expat-libdir-la.patch b/package/expat/expat-libdir-la.patch new file mode 100644 index 000000000..1c8930ea6 --- /dev/null +++ b/package/expat/expat-libdir-la.patch @@ -0,0 +1,77 @@ +--- expat-2.0.0/conftools/ltmain.sh.orig 2007-01-13 14:39:51.000000000 -0700 ++++ expat-2.0.0/conftools/ltmain.sh 2007-01-13 14:39:56.000000000 -0700 +@@ -273,8 +273,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 +@@ -2404,8 +2405,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 + test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes + else +@@ -2886,6 +2893,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 +@@ -5598,6 +5615,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%^.*/%%'` +@@ -5919,10 +5940,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. diff --git a/package/expat/expat.mk b/package/expat/expat.mk index e98b578dd..5142342c4 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,77 +4,22 @@ # ############################################################# -EXPAT_VERSION=2.0.1 -EXPAT_SOURCE=expat-$(EXPAT_VERSION).tar.gz -EXPAT_CAT:=$(ZCAT) -EXPAT_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/expat -EXPAT_DIR:=$(BUILD_DIR)/expat-$(EXPAT_VERSION) +EXPAT_VERSION = 2.0.1 +EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.gz +EXPAT_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/expat +EXPAT_LIBTOOL_PATCH = NO +EXPAT_INSTALL_STAGING = YES +EXPAT_INSTALL_TARGET = YES +# no install-strip / install-exec +EXPAT_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) installlib +EXPAT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) installlib -EXPAT_BINARY:=.libs/libexpat.a -EXPAT_TARGET_BINARY:=usr/lib/libexpat.so.1 +EXPAT_CONF_OPT = --enable-shared -$(DL_DIR)/$(EXPAT_SOURCE): - $(call DOWNLOAD,$(EXPAT_SITE),$(EXPAT_SOURCE)) +EXPAT_DEPENDENCIES = uclibc pkgconfig -expat-source: $(DL_DIR)/$(EXPAT_SOURCE) +$(eval $(call AUTOTARGETS,package,expat)) -$(EXPAT_DIR)/.unpacked: $(DL_DIR)/$(EXPAT_SOURCE) - $(EXPAT_CAT) $(DL_DIR)/$(EXPAT_SOURCE) | \ - tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - $(CONFIG_UPDATE) $(EXPAT_DIR) - $(CONFIG_UPDATE) $(EXPAT_DIR)/conftools +$(EXPAT_HOOK_POST_INSTALL): $(EXPAT_TARGET_INSTALL_TARGET) + $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libexpat.so.* touch $@ - -$(EXPAT_DIR)/.configured: $(EXPAT_DIR)/.unpacked - (cd $(EXPAT_DIR); rm -rf config.cache; \ - $(TARGET_CONFIGURE_OPTS) \ - $(TARGET_CONFIGURE_ARGS) \ - ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --prefix=/usr \ - --exec-prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --enable-shared \ - ) - touch $@ - -$(EXPAT_DIR)/$(EXPAT_BINARY): $(EXPAT_DIR)/.configured - $(MAKE) -C $(EXPAT_DIR) all - touch -c $@ - -$(STAGING_DIR)/$(EXPAT_TARGET_BINARY): $(EXPAT_DIR)/$(EXPAT_BINARY) - $(MAKE) DESTDIR=$(STAGING_DIR) -C $(EXPAT_DIR) install - $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \ - $(STAGING_DIR)/usr/lib/libexpat.la - touch -c $@ - -$(TARGET_DIR)/$(EXPAT_TARGET_BINARY): $(STAGING_DIR)/$(EXPAT_TARGET_BINARY) - mkdir -p $(TARGET_DIR)/usr/lib - cp -dpf $(STAGING_DIR)/usr/lib/libexpat.so* $(TARGET_DIR)/usr/lib/ - #cp -dpf $(STAGING_DIR)/usr/bin/xmlwf $(TARGET_DIR)/usr/bin/xmlwf - -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libexpat.so* - touch -c $@ - -expat: uclibc pkgconfig $(TARGET_DIR)/$(EXPAT_TARGET_BINARY) - -expat-clean: - rm -f $(EXPAT_DIR)/.configured - rm -f $(STAGING_DIR)/usr/lib/libexpat.* \ - $(TARGET_DIR)/usr/lib/libexpat.* - #rm -f $(STAGING_DIR)/usr/bin/xmlwf $(TARGET_DIR)/usr/bin/xmlwf - -$(MAKE) -C $(EXPAT_DIR) clean - -expat-dirclean: - rm -rf $(EXPAT_DIR) - -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_PACKAGE_EXPAT),y) -TARGETS+=expat -endif diff --git a/package/expat/libdir-la.patch b/package/expat/libdir-la.patch deleted file mode 100644 index 1c8930ea6..000000000 --- a/package/expat/libdir-la.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- expat-2.0.0/conftools/ltmain.sh.orig 2007-01-13 14:39:51.000000000 -0700 -+++ expat-2.0.0/conftools/ltmain.sh 2007-01-13 14:39:56.000000000 -0700 -@@ -273,8 +273,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 -@@ -2404,8 +2405,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 - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes - else -@@ -2886,6 +2893,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 -@@ -5598,6 +5615,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%^.*/%%'` -@@ -5919,10 +5940,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. -- cgit v1.2.3