Revision: 6222
http://ipcop.svn.sourceforge.net/ipcop/?rev=6222&view=rev
Author: gespinasse
Date: 2012-01-08 17:56:26 +0000 (Sun, 08 Jan 2012)
Log Message:
-----------
While testing what will be gnupg-1.4.12, I find we dont need Fedora patch.
Just adding 'LDFLAGS += -pie' fix the TEXTREL issue, and --disable-asm is
not required.
Unsure why I haven't been able to reproduce the issue with asm code, maybe this
was fixed with a binutils upgrade?
Add again --enable-noexecstack so stack could be read only.
1.4.12 should be made soon.
Modified Paths:
--------------
ipcop/trunk/lfs/gnupg
Removed Paths:
-------------
ipcop/trunk/src/patches/gnupg-1.4.11_call-gcc.patch
Modified: ipcop/trunk/lfs/gnupg
===================================================================
--- ipcop/trunk/lfs/gnupg 2012-01-08 17:16:57 UTC (rev 6221)
+++ ipcop/trunk/lfs/gnupg 2012-01-08 17:56:26 UTC (rev 6222)
@@ -43,8 +43,9 @@
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
-# Only needed with --disable-asm
+# -fno-strict-aliasing could be removed for 1.4.12
CFLAGS += -fno-strict-aliasing
+LDFLAGS += -pie
###############################################################################
# Top-level Rules
@@ -84,23 +85,19 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- # fix a false positive with --enable-minimal
+ # fix a false positive with --enable-minimal (to be removed with 1.4.12)
cd $(DIR_APP) && patch -Np0 -i
$(DIR_PATCHES)/$(THISAPP)_bug1179-minimal.patch
- # fix TEXTREL issue fedora borrowed
http://pkgs.fedoraproject.org/gitweb/?p=gnupg.git;a=tree
- cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)_call-gcc.patch
rm -rf /home/nobody/.gnupg /root/.gnupg
- # To not disable -PIE compilation, it is needed to disable asm (not
enought register free on i486)
- # --enable-noexecstack only help when asm code is compiled
- cd $(DIR_APP) && autoreconf # because call-gcc patch is against
Makefile.am and configure.ac
cd $(DIR_APP) && ./configure --prefix=/usr \
--build=$(TARGET_2) \
--disable-nls \
--enable-minimal \
- --disable-asm
+ --enable-noexecstack
cd $(DIR_APP) && make -j $(PARALLELISM)
ifeq "$(RUNNING_TEST)" "yes"
+ # Avoid a bit of noise going directly to check directory
cd $(DIR_APP) && make -j 1 --directory=checks check &>
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
# All 27 tests passed
Deleted: ipcop/trunk/src/patches/gnupg-1.4.11_call-gcc.patch
===================================================================
--- ipcop/trunk/src/patches/gnupg-1.4.11_call-gcc.patch 2012-01-08 17:16:57 UTC
(rev 6221)
+++ ipcop/trunk/src/patches/gnupg-1.4.11_call-gcc.patch 2012-01-08 17:56:26 UTC
(rev 6222)
@@ -1,30 +0,0 @@
-Call gcc directly to build assembly files, so that CFLAGS which are needed
-during preprocessing (-DPIC) get properly passed to the preprocessor.
-
---- gnupg-1.4.1/mpi/Makefile.am 2005-03-11 05:27:02.000000000 -0500
-+++ gnupg-1.4.1/mpi/Makefile.am 2005-03-15 23:47:29.000000000 -0500
-@@ -71,9 +71,14 @@
-
- # cancel the default rules used by libtool which do not really
- # work and add one to cpp .S files
-+if USING_GCC
-+.S.o:
-+ $(COMPILE) $(AM_CCASFLAGS) -c $<
-+else
- .S.o:
- $(CPP) $(INCLUDES) $(DEFS) $< | grep -v '^#' > _$*.s
- $(COMPILE) $(AM_CCASFLAGS) -c _$*.s
- mv -f _$*.o $*.o
-+endif
-
- .S.lo:
---- gnupg-1.4.1/configure.ac 2005-03-15 10:51:52.000000000 -0500
-+++ gnupg-1.4.1/configure.ac 2005-03-15 23:47:29.000000000 -0500
-@@ -1232,6 +1232,7 @@
-
- AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes)
-
-+AM_CONDITIONAL(USING_GCC, test x$GCC = xyes)
-
- # add some extra libs here so that previous tests don't fail for
- # mysterious reasons - the final link step should bail out.
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
infrastructure or vast IT resources to deliver seamless, secure access to
virtual desktops. With this all-in-one solution, easily deploy virtual
desktops for less than the cost of PCs and save 60% on VDI infrastructure
costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
