libloc: fix i586 perl module

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/lfs/libloc b/lfs/libloc
index 12bc52ca4d6294779829f97193ff0156ef3b2a59..178f9f9ccd95e1280ce96b8e526a84739768bb26 100644 (file)
--- a/lfs/libloc
+++ b/lfs/libloc
@@ -84,7 +84,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        # Add patch for i586 to disable strong stack protector.
 ifeq "$(BUILD_ARCH)" "i586"
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libloc-0.9.3-perl-regular-stack-protector.patch
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libloc-0.9.3-perl-i586-regular-stack-protector.patch
 endif
 
        cd $(DIR_APP) && ./autogen.sh

diff --git a/src/patches/libloc-0.9.3-perl-regular-stack-protector.patch b/src/patches/libloc-0.9.3-perl-i586-regular-stack-protector.patch
similarity index 55%
rename from src/patches/libloc-0.9.3-perl-regular-stack-protector.patch
rename to src/patches/libloc-0.9.3-perl-i586-regular-stack-protector.patch
index 2ee807a50c5f24cabae62aef9e1dc533f6dbe8d6..ace6b08f3a61740674bdee1982333e02cf513052 100644 (file)
--- a/src/patches/libloc-0.9.3-perl-regular-stack-protector.patch
+++ b/src/patches/libloc-0.9.3-perl-i586-regular-stack-protector.patch
@@ -6,7 +6,7 @@ index 38d5390..62016ca 100644
      LIBS              => ['-lloc'],
      DEFINE            => '', # e.g., '-DHAVE_SOMETHING'
      INC               => '-I. -I../../',
-+    CCFLAGS           => '-fstack-protector',
++    CCFLAGS           => '-D_REENTRANT -D_GNU_SOURCE -O2 -pipe -Wall -fexceptions -fPIC -march=i586 -mindirect-branch=thunk -mfunction-return=thunk -mtune=generic -fomit-frame-pointer -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector -fwrapv -fno-strict-aliasing -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64',
        # Un-comment this if you add C files to link with later:
      # OBJECT            => '$(O_FILES)', # link all the C files too
  );