diff options
| author | jbeich <jbeich@FreeBSD.org> | 2015-04-29 11:20:52 +0800 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2015-04-29 11:20:52 +0800 |
| commit | 8f67ed66b4dfa9a4e8bc13b3432f87e7e529e5ba (patch) | |
| tree | 42c3c6e17bfeced5029bdd4f073afe703b28092c /math/abacus | |
| parent | 204f7a12eb8f030c384fd4195316064120fb8049 (diff) | |
| download | freebsd-ports-gnome-8f67ed66b4dfa9a4e8bc13b3432f87e7e529e5ba.tar.gz freebsd-ports-gnome-8f67ed66b4dfa9a4e8bc13b3432f87e7e529e5ba.tar.zst freebsd-ports-gnome-8f67ed66b4dfa9a4e8bc13b3432f87e7e529e5ba.zip | |
math/abacus: kill roundabout post-patch target
Diffstat (limited to 'math/abacus')
| -rw-r--r-- | math/abacus/Makefile | 11 | ||||
| -rw-r--r-- | math/abacus/files/patch-Makefile | 40 |
2 files changed, 3 insertions, 48 deletions
diff --git a/math/abacus/Makefile b/math/abacus/Makefile index 8622ec53769f..06c527899248 100644 --- a/math/abacus/Makefile +++ b/math/abacus/Makefile @@ -20,14 +20,9 @@ USES= gmake perl5 USE_PERL5= build USE_LDCONFIG= yes ALL_TARGET= abacus - -post-patch: - @${REINPLACE_CMD} \ - -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ - -e 's|%%CXX%%|${CXX}|' \ - -e 's|%%PERL5%%|${PERL5}|' \ - -e 's|%%CXXFLAGS%%|${CXXFLAGS}|' \ - ${WRKSRC}/Makefile +MAKE_ARGS= CCC="${CXX}" PERL="${PERL5}" STRIP="${STRIP_CMD} -x" \ + CCFLAG_DEBOPT="${CXXFLAGS}" \ + OSI_INCLUDE="${LOCALBASE}/include/coin" do-install: ${INSTALL_DATA} ${WRKSRC}/lib/linux20-gcc44/libabacus-osi.a \ diff --git a/math/abacus/files/patch-Makefile b/math/abacus/files/patch-Makefile index 61b826d18723..dae9fc7fd6cd 100644 --- a/math/abacus/files/patch-Makefile +++ b/math/abacus/files/patch-Makefile @@ -1,45 +1,5 @@ --- Makefile.orig 2012-01-06 14:29:04.000000000 +0100 +++ Makefile 2013-09-05 14:35:52.000000000 +0200 -@@ -7,7 +7,7 @@ - ####################################################################### - - # Path to coin-osi header files -- OSI_INCLUDE=/usr/include/coin -+ OSI_INCLUDE=%%LOCALBASE%%/include/coin - # Path to solver include directories - leave empty if the solver - # is not installed - CLP_PATH=$(OSI_INCLUDE) -@@ -40,7 +40,7 @@ - ####################################################################### - - # gcc --CCC = g++-4.4 -+CCC = %%CXX%% - - # add files to an archive - ARCHIVE = ar rc -@@ -48,10 +48,10 @@ - # PRE_ARCHIVE is used to instantiate required templates (SGI) - PRE_ARCHIVE = true - --STRIP = strip -x -+STRIP = true - - AWK = awk --PERL = /usr/bin/perl -+PERL = %%PERL5%% - - # Gnu cp - GCP = /bin/cp -@@ -59,7 +59,7 @@ - CPLEXFLAGS = -DCPX_PROTOTYPE_ANSI -DPROTOTYPE_MAX - CCFLAG_SYS = -DABACUS_SYS_LINUX -DABACUS_THROW_WITH_INFO - CCFLAG_COMPILER = -DABACUS_COMPILER_GCC43 -Wall --CCFLAG_DEBOPT = -O2 -+CCFLAG_DEBOPT = %%CXXFLAGS%% - CCFLAG_PARALLEL = - - # default parallel flags (to be defined in machine specific makefile). @@ -177,6 +177,11 @@ $(OBJDIR)/%.o: $(SRCDIR)/%.cc $(CCC) $(CCFLAGS) $(ADDFLAGS) -c $< -o $@ $(STRIP) $@ |