diff options
| author |   Andrew Savchenko <bircoph@gentoo.org> | 2019-01-30 08:41:12 +0300 |
|---|---|---|
| committer | Andrew Savchenko <bircoph@gentoo.org> | 2019-01-30 08:41:12 +0300 |
| commit | f7e784db2ef31b9df95670407c28cd6d740a597a (patch) | |
| tree | 513ba73d00cc82b571d9a4e35a419d115772cdc9 /sci-physics/qcl/files/qcl-0.6.4-Makefile.patch | |
| parent | sci-biology/biobambam2: upstream moved from github to gitlab (diff) | |
| download | sci-f7e784db2ef31b9df95670407c28cd6d740a597a.tar.gz sci-f7e784db2ef31b9df95670407c28cd6d740a597a.tar.bz2 sci-f7e784db2ef31b9df95670407c28cd6d740a597a.zip | |
sci-physics/qcl: multiple improvements
- Update to EAPI 7
- Fix dependencies (RDEPEND were wrong)
- Install additional documentation
- Respect CFLAGS for qc lib as well
- Fix install paths so that qcl can find its lib
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>
Diffstat (limited to 'sci-physics/qcl/files/qcl-0.6.4-Makefile.patch')
| -rw-r--r-- | sci-physics/qcl/files/qcl-0.6.4-Makefile.patch | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/sci-physics/qcl/files/qcl-0.6.4-Makefile.patch b/sci-physics/qcl/files/qcl-0.6.4-Makefile.patch new file mode 100644 index 000000000..bbc3f0abd --- /dev/null +++ b/sci-physics/qcl/files/qcl-0.6.4-Makefile.patch @@ -0,0 +1,69 @@ +diff --git a/Makefile b/Makefile +index 2735f71..80f9b30 100644 +--- a/Makefile ++++ b/Makefile +@@ -14,11 +14,11 @@ VERSION=0.6.4 + + # Directory for Standard .qcl files + +-QCLDIR = /usr/local/lib/qcl ++QCLDIR = /usr/lib/qcl + + # Path for qcl binaries + +-QCLBIN = /usr/local/bin ++QCLBIN = /usr/bin + + ARCH = `g++ -dumpmachine || echo bin` + +@@ -32,7 +32,7 @@ ARCH = `g++ -dumpmachine || echo bin` + + #DEBUG = -g -pg -DQCL_DEBUG -DQC_DEBUG + #DEBUG = -g -DQCL_DEBUG -DQC_DEBUG +-DEBUG = -O2 -g -DQCL_DEBUG -DQC_DEBUG ++DEBUG = -DQCL_DEBUG -DQC_DEBUG + #DEBUG = -O2 + + # Plotting support +@@ -81,8 +81,8 @@ QCLINC = lib + + #CXX = g++ + #CPP = $(CC) -E +-CXXFLAGS = -c $(ARCHOPT) $(DEBUG) $(PLOPT) $(RLOPT) $(IRQOPT) $(ENCOPT) -I$(QCDIR) -DDEF_INCLUDE_PATH="\"$(QCLDIR)\"" +-LDFLAGS = $(ARCHOPT) -L$(QCDIR) $(DEBUG) $(PLLIB) -lm -lfl -lqc $(RLLIB) ++CXXFLAGS += -c $(DEBUG) $(PLOPT) $(RLOPT) $(IRQOPT) $(ENCOPT) -I$(QCDIR) -DDEF_INCLUDE_PATH="\"$(QCLDIR)\"" ++LIBS = -L$(QCDIR) $(PLLIB) -lm -lfl -lqc $(RLLIB) + + FILESCC = $(wildcard *.cc) + FILESH = $(wildcard *.h) +@@ -127,7 +127,7 @@ $(QCLIB): + build: qcl $(QCLINC)/default.qcl + + qcl: $(OBJECTS) qcl.o $(QCLIB) +- $(CXX) $(OBJECTS) qcl.o $(LDFLAGS) -o qcl ++ $(CXX) $(LDFLAGS) $(OBJECTS) qcl.o $(LIBS) -o qcl + + $(QCLINC)/default.qcl: extern.cc + grep "^//!" extern.cc | cut -c5- > $(QCLINC)/default.qcl +diff --git a/qc/Makefile b/qc/Makefile +index 191ffe5..79724a9 100644 +--- a/qc/Makefile ++++ b/qc/Makefile +@@ -16,7 +16,7 @@ + + # Debugging options + +-DEBUG = -g -O2 -DQC_DEBUG ++#DEBUG = -g -O2 -DQC_DEBUG + #DEBUG = -g -pg -DQC_DEBUG + #DEBUG = -O2 + +@@ -25,7 +25,7 @@ DEBUG = -g -O2 -DQC_DEBUG + + #PRGOPT = -DQC_USE_RAND48 + +-CXXFLAGS = $(ARCHOPT) -c -pedantic -Wall $(DEBUG) $(PRGOPT) ++CXXFLAGS += $(ARCHOPT) -c -pedantic -Wall $(DEBUG) $(PRGOPT) + + LDFLAGS = $(ARCHOPT) -L. -lm -lqc + |