]> git.ipfire.org Git - ipfire-2.x.git/blobdiff - lfs/glibc
Make perl-PDF-API2 part of the base system
[ipfire-2.x.git] / lfs / glibc
index 6cb73119fe6f0509934bfb669caed3d149c085ad..122aca58fdd6b6927770d3473be865a7ceb65260 100644 (file)
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -38,7 +38,8 @@ ifeq "$(ROOT)" ""
   EXTRA_CONFIG = \
        --build=$(BUILDTARGET) \
        --prefix=/usr \
-       --libexecdir=/usr/lib/glibc
+       --libexecdir=/usr/lib/glibc \
+       --enable-stack-protector=strong
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
   EXTRA_CONFIG = \
@@ -69,13 +70,13 @@ endif
 
 # Add some general configuration flags
 EXTRA_CONFIG += \
+       --enable-obsolete-rpc \
        --disable-profile \
        --enable-kernel=3.2 \
        --enable-add-ons \
        --without-selinux \
        --enable-experimental-malloc \
-       --enable-bind-now \
-       --enable-stack-protector=strong
+       --enable-bind-now
 
 ###############################################################################
 # Top-level Rules
@@ -117,6 +118,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) $(DIR_SRC)/glibc-build && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
        @mkdir $(DIR_SRC)/glibc-build
 
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-localedef-no-archive.patch
+
 ifneq "$(TOOLCHAIN)" "1"
  ifeq "$(BUILD_ARCH)" "x86_64"
        cd $(DIR_APP) && sed -i 's|libs -o|libs -L/usr/lib64 -Wl,-dynamic-linker=/lib64/ld-linux-x86-64.so.2 -o|' \
@@ -143,9 +146,7 @@ endif
 
        cd $(DIR_SRC)/glibc-build && make install
 
-ifeq "$(TOOLCHAIN)" "1"
-       ln -svf lib /tools/lib64
-else
+ifneq "$(TOOLCHAIN)" "1"
        # Creating the locales
        mkdir -p /usr/lib/locale
        cd $(DIR_SRC)/glibc-build && make localedata/install-locales
@@ -154,5 +155,15 @@ else
        rm -rfv /usr/share/zoneinfo
 endif
 
+ifeq "$(TOOLCHAIN)" "1"
+       # Test the linker in toolchain
+       cd $(DIR_APP) && echo "int main() { return 0; }" > dummy.c
+       cd $(DIR_APP) && $(CROSSTARGET)-gcc dummy.c -o dummy
+
+       # Must be using a runtime linker from /tools
+       cd $(DIR_APP) && readelf -l dummy | grep "Requesting program interpreter: /tools"
+       cd $(DIR_APP) && rm -vf dummy dummy.c
+endif
+
        @rm -rf $(DIR_APP) $(DIR_SRC)/glibc-build
        @$(POSTBUILD)