[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 03cd6810d3895831c3c9840a5eae0f22ae1916e5

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 03cd6810d3895831c3c9840a5eae0f22ae1916e5

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 3095 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, master has been updated
       via  03cd6810d3895831c3c9840a5eae0f22ae1916e5 (commit)
      from  99659ce50b2a693217d674b380af6ffdac191832 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 03cd6810d3895831c3c9840a5eae0f22ae1916e5
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Mon Aug 3 19:52:38 2020 +0200

    libloc: fix i586 perl module
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 lfs/libloc                                                              | 2 +-
 ...ector.patch => libloc-0.9.3-perl-i586-regular-stack-protector.patch} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename src/patches/{libloc-0.9.3-perl-regular-stack-protector.patch => libloc-0.9.3-perl-i586-regular-stack-protector.patch} (55%)

Difference in files:
diff --git a/lfs/libloc b/lfs/libloc
index 12bc52ca4..178f9f9cc 100644
--- 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 2ee807a50..ace6b08f3 100644
--- 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
  );


hooks/post-receive
--
IPFire 2.x development tree