]> git.ipfire.org Git - people/ms/ipfire-3.x.git/commitdiff
Made cpio compiling with SSP...
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 25 Jun 2008 18:46:10 +0000 (18:46 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 25 Jun 2008 18:46:10 +0000 (18:46 +0000)
Does anybody know if this "-z muldefs" is safe?

lfs/cpio

index 5f1f11d411aed035b3fcb9ed825beaeb8ef95ae9..2107443de1f012b2959f063588fd37a4d423de58 100644 (file)
--- a/lfs/cpio
+++ b/lfs/cpio
@@ -55,21 +55,26 @@ $(TARGET) :
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 
 ifeq "$(STAGE)" "ipfire"
-       cd $(DIR_APP) && ./configure CPIO_MT_PROG=mt --prefix=/usr \
-                                               --bindir=/bin --libexecdir=/tmp \
-                                               --with-rmt=/usr/sbin/rmt
+       cd $(DIR_APP) && LDFLAGS="-z muldefs" \
+               ./configure CPIO_MT_PROG=mt \
+                       --prefix=/usr \
+                       --bindir=/bin \
+                       --libexecdir=/tmp \
+                       --with-rmt=/usr/sbin/rmt
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
        cd $(DIR_APP) && make install
 endif
 
 ifeq "$(STAGE)" "installer"
-       cd $(DIR_APP) && ./configure CPIO_MT_PROG=mt \
-                                               --prefix=/usr \
-                                               --target=$(UCLIBC_TARGET) \
-                                               --host=$(UCLIBC_TARGET)
-                                               --bindir=/bin --libexecdir=/tmp \
-                                               --with-rmt=/usr/sbin/rmt \
-                                               --disable-nls
+       cd $(DIR_APP) && LDFLAGS="-z muldefs" \
+               ./configure CPIO_MT_PROG=mt \
+                       --prefix=/usr \
+                       --target=$(UCLIBC_TARGET) \
+                       --host=$(UCLIBC_TARGET)
+                       --bindir=/bin \
+                       --libexecdir=/tmp \
+                       --with-rmt=/usr/sbin/rmt \
+                       --disable-nls
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
        cd $(DIR_APP) && make install DESTDIR=$(INSTALLER_DIR)
 endif