cross-compile tweaks

Package-Manager: portage-2.0.51.22-r2

3 files changed, 52 insertions, 21 deletions

diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 2a33f30f896c..58dbfabc16ff 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -5,7 +5,7 @@ MD5 ebc8234a7bc9fc34fffbba6ecc5c3487 e2fsprogs-1.37-r1.ebuild 3446
 MD5 37cb0ccd95b17f3838109fb5c07bdd5c e2fsprogs-1.35-r1.ebuild 3377
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 54432110b1e54ba458f618f72d355216 e2fsprogs-1.36.ebuild 3400
-MD5 0cd5e4948291f1a2613b880192a12541 e2fsprogs-1.38.ebuild 3316
+MD5 d8ea818272e7bef0cd8e43e106560e2c e2fsprogs-1.38.ebuild 3308
 MD5 3175f69bbef8d8d5b28da5e04acf22e6 e2fsprogs-1.36-r2.ebuild 2626
 MD5 d3944e2cf57c3a7912600635a3edc7b9 ChangeLog 12542
 MD5 92cb7d0ad3274ae7ecae662e1cd428c3 e2fsprogs-1.37.ebuild 3087
@@ -18,13 +18,13 @@ MD5 4a7d54ccac4002d10462c40660712a72 files/e2fsprogs-1.36-sed-locale.patch 2142
 MD5 0911aedd4968aa4053139791a961e2a2 files/digest-e2fsprogs-1.38 67
 MD5 65689a8be4c1b58f8e64f22165313292 files/digest-e2fsprogs-1.37-r1 67
 MD5 e85d057f99af6c980acf9a8697da9dd7 files/e2fsprogs-1.38-disconnected-inodes.patch 2881
-MD5 a47cce15da0a4e01bb3cec306d9d7dbe files/e2fsprogs-1.36-makefile.patch 2910
+MD5 c5e6ed46f8a6b9f75273863110887b22 files/e2fsprogs-1.36-makefile.patch 3546
 MD5 f079047f6885f762f6fa838b55236cb2 files/e2fsprogs-sed-locale.patch 5989
 MD5 e86bf4d241506baff5f647cbd30ae7a0 files/digest-e2fsprogs-1.36 67
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFC9awegIKl8Uu19MoRAhRqAJ9U3uMGW5sNBRLudrXS48/eVr4AkQCfc2Ze
-CqZVUn+SyykwpD2Zo0Eop5A=
-=sDMk
+iD8DBQFC+shxgIKl8Uu19MoRAsnfAJ9SckEaj4l9MnhblLWajigVGc6yVQCcCB0B
+EISOvSUXaakKRClsC2fbOUU=
+=V5TC
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.38.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.38.ebuild
index 6218aa26e9e4..941aa8b3774c 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.38.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.38.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.38.ebuild,v 1.8 2005/08/07 06:36:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.38.ebuild,v 1.9 2005/08/11 03:38:51 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -46,10 +46,10 @@ src_unpack() {
 		-e '/^LIB_SUBDIRS/s:lib/ss::' \
 		Makefile.in || die "remove subdirs"
 	ln -s "${ROOT}"/usr/$(get_libdir)/libcom_err.a lib/libcom_err.a
-	ln -s "${ROOT}"/usr/$(get_libdir)/libcom_err.so lib/libcom_err.so
+	ln -s "${ROOT}"/$(get_libdir)/libcom_err.so lib/libcom_err.so
 	ln -s /usr/bin/mk_cmds lib/ss/mk_cmds
 	ln -s "${ROOT}"/usr/include/ss/ss_err.h lib/ss/
-	ln -s "${ROOT}"/usr/$(get_libdir)/libss.so lib/libss.so
+	ln -s "${ROOT}"/$(get_libdir)/libss.so lib/libss.so
 
 	# Keep the package from doing silly things
 	export LDCONFIG=/bin/true
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.36-makefile.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.36-makefile.patch
index 02ecca735813..807759a3c652 100644
--- a/sys-fs/e2fsprogs/files/e2fsprogs-1.36-makefile.patch
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.36-makefile.patch
@@ -1,15 +1,12 @@
-Make sure headers are installed.
-Also fix the symlinks that submakefiles create so that they don't suck at life.
-
---- e2fsprogs-1.36/Makefile.in
-+++ e2fsprogs-1.36/Makefile.in
+--- Makefile.in
++++ Makefile.in
 @@ -48,3 +48,3 @@
    install-shlibs-libs-recursive install-doc-libs
 -	if test ! -d e2fsck && test ! -d debugfs && test ! -d misc && test ! -d ext2ed ; then $(MAKE) install-libs ; fi
 +	$(MAKE) install-libs
  
---- e2fsprogs-1.36/e2fsck/Makefile.in
-+++ e2fsprogs-1.36/e2fsck/Makefile.in
+--- e2fsck/Makefile.in
++++ e2fsck/Makefile.in
 @@ -163,6 +163,6 @@
  	@echo "	LINK $(root_sbindir)/fsck.ext2"
 -	@$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
@@ -28,8 +25,8 @@ Also fix the symlinks that submakefiles create so that they don't suck at life.
 -	@$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
 +	@$(LN_S) -f e2fsck.8 \
  		$(DESTDIR)$(man8dir)/fsck.ext3.8
---- e2fsprogs-1.36/misc/Makefile.in
-+++ e2fsprogs-1.36/misc/Makefile.in
+--- misc/Makefile.in
++++ misc/Makefile.in
 @@ -228,12 +228,12 @@
  	@echo "	LINK $(root_sbindir)/mkfs.ext2"
 -	@$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
@@ -56,8 +53,8 @@ Also fix the symlinks that submakefiles create so that they don't suck at life.
 -	@$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
 +	@$(LN_S) -f mke2fs.8 \
  		$(DESTDIR)$(man8dir)/mkfs.ext3.8
---- e2fsprogs-1.36/lib/uuid/Makefile.in
-+++ e2fsprogs-1.36/lib/uuid/Makefile.in
+--- lib/uuid/Makefile.in
++++ lib/uuid/Makefile.in
 @@ -148,5 +148,5 @@
  	@echo "	LINK $(man3dir)/uuid_generate_random.3"
 -	@$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_random.3
@@ -66,10 +63,44 @@ Also fix the symlinks that submakefiles create so that they don't suck at life.
 -	@$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3
 +	@$(LN_S) -f uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3
  	@echo "	INSTALL_DATA $(libdir)/pkgconfig/uuid.pc"
---- e2fsprogs-1.36/lib/Makefile.elf-lib
-+++ e2fsprogs-1.36/lib/Makefile.elf-lib
+--- lib/Makefile.elf-lib
++++ lib/Makefile.elf-lib
+@@ -26,7 +26,7 @@
+ 
+ $(ELF_LIB): $(OBJS)
+ 	@echo "	GEN_ELF_SOLIB $(ELF_LIB)"
+-	@(cd elfshared; $(CC) --shared -o $(ELF_LIB) \
++	@(cd elfshared; $(CC) --shared -o $(ELF_LIB) $(LDFLAGS) \
+ 		-Wl,-soname,$(ELF_SONAME) $(OBJS) $(ELF_OTHER_LIBS))
+ 	@$(MV) elfshared/$(ELF_LIB) .
+ 	@$(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME)
 @@ -49,3 +49,3 @@
  	@echo "	SYMLINK $(libdir)/$(ELF_IMAGE).so"
 -	@$(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
 +	@$(LN_S) -f $(ELF_SONAME) \
  		$(DESTDIR)$(libdir)/$(ELF_IMAGE).so
+--- util/Makefile.in
++++ util/Makefile.in
+@@ -15,7 +15,7 @@
+ 
+ .c.o:
+ 	@echo "	CC $<"
+-	@$(BUILD_CC) -c $(ALL_CFLAGS) $< -o $@
++	@$(BUILD_CC) -c $(DEFS) $< -o $@
+ 
+ PROGS=		subst
+ 
+@@ -23,11 +23,11 @@
+ 
+ subst: subst.o
+ 	@echo "	LD $@"
+-	@$(BUILD_CC) $(ALL_LDFLAGS) -o subst subst.o
++	@$(BUILD_CC) -o subst subst.o
+ 
+ copy_sparse: copy_sparse.o
+ 	@echo "	LD $@"
+-	@$(BUILD_CC) $(ALL_LDFLAGS) -o copy_sparse copy_sparse.o
++	@$(BUILD_CC) -o copy_sparse copy_sparse.o
+ 
+ gen-tarball: $(srcdir)/gen-tarball.in $(top_builddir)/config.status
+ 	@echo "	CONFIG.STATUS $@"