diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /sci-physics/cernlib/files/cernlib-2006-nogfortran.patch | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sci-physics/cernlib/files/cernlib-2006-nogfortran.patch')
-rw-r--r-- | sci-physics/cernlib/files/cernlib-2006-nogfortran.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/sci-physics/cernlib/files/cernlib-2006-nogfortran.patch b/sci-physics/cernlib/files/cernlib-2006-nogfortran.patch new file mode 100644 index 000000000000..63883274403f --- /dev/null +++ b/sci-physics/cernlib/files/cernlib-2006-nogfortran.patch @@ -0,0 +1,56 @@ +--- debian/add-ons/Makefile.orig 2008-03-15 16:46:46.000000000 +0000 ++++ debian/add-ons/Makefile 2008-03-15 16:47:51.000000000 +0000 +@@ -28,6 +28,9 @@ + ifneq (,$(findstring ifort,$(DEB_BUILD_OPTIONS))) + sed -i -e 's/-lgfortran/-limf/' $(CERN_BINDIR)/cernlib + endif ++ifneq (,$(findstring g77,$(DEB_BUILD_OPTIONS))) ++ sed -i -e 's/-lgfortran/-lg2c/' $(CERN_BINDIR)/cernlib ++endif + chmod a+x $(CERN_BINDIR)/cernlib + + # target to install include files for development packages +--- debian/add-ons/cernlib.mk.orig 2008-03-15 16:48:05.000000000 +0000 ++++ debian/add-ons/cernlib.mk 2008-03-15 17:09:14.000000000 +0000 +@@ -35,6 +35,10 @@ + export TOOL_SONAME = _gfortran + export TOOL_NAME = _gfortran + endif ++ifeq (,$(findstring g77,$(DEB_BUILD_OPTIONS))) ++ export TOOL_SONAME = _gfortran ++ export TOOL_NAME = _gfortran ++endif + export PATH := $(CERN_BINDIR):$(ADDONDIR)/bin:$(datadir)/cernlib:${PATH} + export INSTALL_OPTS ?= -s + export CC ?= gcc +@@ -118,6 +122,8 @@ + endif + ifneq (,$(findstring ifort,$(DEB_BUILD_OPTIONS))) + echo '#define HasIntelifc YES' >> $(CVSCOSRC)/config/host.def ++else ifneq (,$(findstring g77,$(DEB_BUILD_OPTIONS))) ++ echo >> $(CVSCOSRC)/config/host.def + else + echo '#define Hasgfortran YES' >> $(CVSCOSRC)/config/host.def + endif +--- debian/patches/320-support-ifort.dpatch.orig 2008-03-15 17:31:34.000000000 +0000 ++++ debian/patches/320-support-ifort.dpatch 2008-03-15 17:31:56.000000000 +0000 +@@ -27,7 +27,7 @@ + #if defined(CERNLIB_UNIX) + CLIBS= -G Motif kernlib + +# if defined(CERNLIB_INTELIFC) +-+CLIBS= $(CLIBS) -nofor_main +++CLIBS:= $(CLIBS) -nofor_main + +# endif + #endif + +--- debian/patches/803-link-binaries-dynamically.dpatch.orig 2008-03-15 17:48:38.000000000 +0000 ++++ debian/patches/803-link-binaries-dynamically.dpatch 2008-03-15 17:49:17.000000000 +0000 +@@ -64,7 +64,7 @@ + -CLIBS= -G Motif kernlib + +CLIBS= -G Motif -u Xm + # if defined(CERNLIB_INTELIFC) +- CLIBS= $(CLIBS) -nofor_main ++ CLIBS:= $(CLIBS) -nofor_main + # endif + #endif + |