Removed some hardcoded -fPIC.

diff --git a/lfs/bzip2 b/lfs/bzip2
index c6257e8edeed894d4beaec4213f6ae94291ce465..c8484f60b5746f7328279791b99457189263ac60 100644 (file)
--- a/lfs/bzip2
+++ b/lfs/bzip2
@@ -85,7 +85,7 @@ endif
 ifeq "$(STAGE)" "base"
        cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-install_docs-1.patch
        cd $(DIR_APP) && sed -e "s/$$(CC) -shared/& $(CFLAGS)/" -i Makefile-libbz2_so
-       cd $(DIR_APP) && make CFLAGS="$(CFLAGS) -D_FILE_OFFSET_BITS=64 -fpic" -f Makefile-libbz2_so
+       cd $(DIR_APP) && make CFLAGS="$(CFLAGS) -D_FILE_OFFSET_BITS=64" -f Makefile-libbz2_so
        cd $(DIR_APP) && make clean
        cd $(DIR_APP) && make CFLAGS="$(CFLAGS) -D_FILE_OFFSET_BITS=64" $(PARALLELISMFLAGS)
        cd $(DIR_APP) && make PREFIX=/usr install

diff --git a/lfs/e2fsprogs b/lfs/e2fsprogs
index 52186df07716eaf7d14b2287cad26e7c985c018d..a9cd8c3225fbe0dc776eae9f6f8a36e0bbd139d5 100644 (file)
--- a/lfs/e2fsprogs
+++ b/lfs/e2fsprogs
@@ -50,8 +50,6 @@ define LONG_DESC
        and third extended (ext2/ext3) filesystems.
 endef
 
-CFLAGS    += -fpic
-
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -80,7 +78,6 @@ $(OBJECT): $(objects)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE)
        -mkdir $(DIR_APP)/build
 
-ifeq "$(STAGE)" "toolchain"
        # Fix DT_TEXTREL in e2fsprogs libraries. --disable-shared and
        # --with-pic are not options in E2fsprogs:
        cd $(DIR_APP) && \
@@ -96,6 +93,7 @@ ifeq "$(STAGE)" "toolchain"
                -e "s/getenv(\"BLKID_DEBUG\")/safe_getenv(\"BLKID_DEBUG\")/" \
                -i lib/blkid/cache.c
 
+ifeq "$(STAGE)" "toolchain"
        cd $(DIR_APP)/build && \
                ../configure \
                        $(CONFIGURE_ARCH) \

diff --git a/lfs/libbdevid b/lfs/libbdevid
index 303da1fae2eb4bec737dc5f2c45ef944d01642b8..1eb644c28445b4c2aa0ab79c105cd2e66f92af4d 100644 (file)
--- a/lfs/libbdevid
+++ b/lfs/libbdevid
@@ -76,7 +76,6 @@ $(objects):
 $(OBJECT): $(objects)
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && sed -e "s/^CFLAGS += -Iinclude/CFLAGS = $(CFLAGS) -fpic -Iinclude/g" -i Makefile
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/squid b/lfs/squid
index 5bca7f26f92e87e671c502f47fe8576d246146f7..84a0b3b0435fa4daa4f4e22b51c0a8d4966dd2a7 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -36,8 +36,6 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
-CFLAGS    += -fpic
-
 ###############################################################################
 # Top-level Rules
 ###############################################################################