summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-physics/geant/files/geant-4.9.3-respect_flags.patch')
-rw-r--r--sci-physics/geant/files/geant-4.9.3-respect_flags.patch125
1 files changed, 0 insertions, 125 deletions
diff --git a/sci-physics/geant/files/geant-4.9.3-respect_flags.patch b/sci-physics/geant/files/geant-4.9.3-respect_flags.patch
deleted file mode 100644
index 52a7caf..0000000
--- a/sci-physics/geant/files/geant-4.9.3-respect_flags.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-Respect CXX, compiler flags
-Fix build with --as-needed
-
-http://bugs.gentoo.org/show_bug.cgi?id=344119
-
---- config/sys/Linux-g++.gmk
-+++ config/sys/Linux-g++.gmk
-@@ -2,9 +2,7 @@
- # ------ GNU/LINUX ------ gcc 3.2 and higher
- #
- ifeq ($(G4SYSTEM),Linux-g++)
-- CXX := g++
-- CXXFLAGS := -W -Wall -ansi -pedantic -Wno-non-virtual-dtor -Wno-long-long
-- CXXFLAGS += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual -pipe
-+ CXXFLAGS += -ansi
- #
- # Uncomment the following options to activate Pentium4 chip specific
- # floating-point operations on the SSE unit. It will allow for more stable
-@@ -14,27 +12,16 @@
- # platforms. Will only run on Pentium4-based architectures !
- #
- # CXXFLAGS += -march=pentium4 -mfpmath=sse
-- ifdef G4OPTIMISE
-- CXXFLAGS += -O2
-- FCFLAGS := -O2
-- CCFLAGS := -O2
-- else
-- ifdef G4DEBUG
-+ ifdef G4DEBUG
- CXXFLAGS += -g
-- FCFLAGS := -g
-- CCFLAGS := -g
-- endif
-+ FCFLAGS += -g
-+ CCFLAGS += -g
- endif
- ifdef G4PROFILE
- CXXFLAGS += -pg
- FCFLAGS += -pg
- CCFLAGS += -pg
- endif
-- ifdef G4OPTDEBUG
-- CXXFLAGS += -O2 -g
-- FCFLAGS += -O2 -g
-- CCFLAGS += -O2 -g
-- endif
- ifdef G4LIB_BUILD_SHARED
- CXXFLAGS += -fPIC
- FCFLAGS += -fPIC
-@@ -42,7 +29,6 @@
- endif
- G4RUNPATHOPTION := -Wl,-rpath
- CC := gcc
-- FC := gfortran
- FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
- FCLIBS := -lg2c -lnsl
- ECHO := /bin/echo -e
-@@ -108,7 +94,7 @@
- endif
- ifndef QTLIBPATH
- QTLIBPATH := $(QTHOME)/lib
-- QT_SEARCH_LIB := $(shell ls $(QTLIBPATH)/qt$(QT_VERSION)/libq* 2>/dev/null | wc -l )
-+ QT_SEARCH_LIB := $(shell ls $(QTLIBPATH)/qt$(QT_VERSION)/lib[q,Q]t* 2>/dev/null | wc -l )
- ifneq ($(QT_SEARCH_LIB),0)
- QTLIBPATH := $(QTHOME)/lib/qt$(QT_VERSION)
- endif
-@@ -140,13 +126,13 @@
- define build-granular-shared-lib
- @libdir=`(cd $(@D);/bin/pwd)`; \
- cd $(G4TMPDIR); \
-- $(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) $(INTYLIBS) *.o
-+ $(CXX) $(LDFLAGS) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) *.o $(INTYLIBS);
- endef
- define build-global-shared-lib
- @libdir=`(cd $(@D);/bin/pwd)`; \
- cd $(G4TMP)/$(G4SYSTEM); \
-- $(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) $(INTYLIBS) \
-- $(foreach dir,$(SUBLIBS),$(dir)/*.o);
-+ $(CXX) $(LDFLAGS) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) \
-+ $(foreach dir,$(SUBLIBS),$(dir)/*.o) $(INTYLIBS);
- endef
-
- endif
---- config/sys/Linux-icc.gmk
-+++ config/sys/Linux-icc.gmk
-@@ -3,17 +3,11 @@
- #
- ifeq ($(G4SYSTEM),Linux-icc)
- CXX := icc
-- CXXFLAGS := -ansi -fp-model precise -no-gcc -w1
-- ifdef G4OPTIMISE
-- CXXFLAGS += -O2
-- FCFLAGS := -O2
-- CCFLAGS := -O2
-- else
-- ifdef G4DEBUG
-- CXXFLAGS += -g
-- FCFLAGS := -g
-- CCFLAGS := -g
-- endif
-+ CXXFLAGS += -ansi
-+ ifdef G4DEBUG
-+ CXXFLAGS += -g
-+ FCFLAGS += -g
-+ CCFLAGS += -g
- endif
- ifdef G4PROFILE
- CXXFLAGS += -qp
-@@ -61,13 +55,13 @@
- define build-granular-shared-lib
- @libdir=`(cd $(@D);/bin/pwd)`; \
- cd $(G4TMPDIR); \
-- $(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) $(INTYLIBS) *.o
-+ $(CXX) $(LDFLAGS) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) *.o $(INTYLIBS);
- endef
- define build-global-shared-lib
- @libdir=`(cd $(@D);/bin/pwd)`; \
- cd $(G4TMP)/$(G4SYSTEM); \
-- $(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) $(INTYLIBS) \
-- $(foreach dir,$(SUBLIBS),$(dir)/*.o);
-+ $(CXX) $(LDFLAGS) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) \
-+ $(foreach dir,$(SUBLIBS),$(dir)/*.o) $(INTYLIBS);
- endef
-
- endif