diff options
author | 2016-06-02 20:46:26 +0300 | |
---|---|---|
committer | 2016-06-02 20:46:26 +0300 | |
commit | 5e68a3da81c6d9bf49e34befae47d3e497c214cb (patch) | |
tree | 9629125be1feb58bc78dea7d6c269371ed52aa41 /sci-physics/qcl/files | |
parent | sci-physics/qcl: adjust patch level for eapply defaults (diff) | |
download | sci-5e68a3da81c6d9bf49e34befae47d3e497c214cb.tar.gz sci-5e68a3da81c6d9bf49e34befae47d3e497c214cb.tar.bz2 sci-5e68a3da81c6d9bf49e34befae47d3e497c214cb.zip |
sci-physics/qcl: rectify ebuild
- bump to EAPI 6;
- add missing bison/flex deps;
- plotutils and readline deps are now controlled by USE flags;
- apply LDFLAGS properly (before list of object files).
Package-Manager: portage-2.3.0_rc1
Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>
Diffstat (limited to 'sci-physics/qcl/files')
-rw-r--r-- | sci-physics/qcl/files/qcl-0.6.4-makefile_v2.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/sci-physics/qcl/files/qcl-0.6.4-makefile_v2.patch b/sci-physics/qcl/files/qcl-0.6.4-makefile_v2.patch new file mode 100644 index 000000000..74b05c5f5 --- /dev/null +++ b/sci-physics/qcl/files/qcl-0.6.4-makefile_v2.patch @@ -0,0 +1,31 @@ +--- a/Makefile ++++ b/Makefile +@@ -32,7 +32,7 @@ + + #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 @@ + + #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 @@ + 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 |