diff options
| author | Dmitry Sivachenko <demon@FreeBSD.org> | 2014-07-24 12:02:32 +0000 |
|---|---|---|
| committer | Dmitry Sivachenko <demon@FreeBSD.org> | 2014-07-24 12:02:32 +0000 |
| commit | 61a41b8a338bb69b4213c5ba3de499c58bff2849 (patch) | |
| tree | 088dacb7c0b0e11e7914142ac2396378514c3888 /textproc/srilm | |
| parent | 523d91ca2f1164ce553792e1f97113e87d0fc608 (diff) | |
| download | ports-61a41b8a338bb69b4213c5ba3de499c58bff2849.tar.gz ports-61a41b8a338bb69b4213c5ba3de499c58bff2849.zip | |
Respect CFLAGS;
Respect LDFLAGS so binaries find the correct libstdc++.so.6 (it picked
this library from lib/compat before this change).
Thanks gerald@.
Notes
Notes:
svn path=/head/; revision=362788
Diffstat (limited to 'textproc/srilm')
| -rw-r--r-- | textproc/srilm/files/patch-Makefile.machine.freebsd | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/textproc/srilm/files/patch-Makefile.machine.freebsd b/textproc/srilm/files/patch-Makefile.machine.freebsd index 9d97ec13e693..8000f1df35b0 100644 --- a/textproc/srilm/files/patch-Makefile.machine.freebsd +++ b/textproc/srilm/files/patch-Makefile.machine.freebsd @@ -1,5 +1,20 @@ ---- common/Makefile.machine.freebsd.orig Mon Oct 20 02:59:58 2003 -+++ common/Makefile.machine.freebsd Sat Oct 23 11:12:06 2004 +--- common/Makefile.machine.freebsd.orig 2006-01-05 23:25:59.000000000 +0300 ++++ common/Makefile.machine.freebsd 2014-07-24 15:58:41.000000000 +0400 +@@ -26,11 +26,11 @@ + EXPORT_LDFLAGS = -s + + # Shared compilation flags. +- CFLAGS = $(ADDITIONAL_CFLAGS) $(INCLUDES) +- CXXFLAGS = $(ADDITIONAL_CXXFLAGS) $(INCLUDES) ++ CFLAGS += $(ADDITIONAL_CFLAGS) $(INCLUDES) ++ CXXFLAGS += $(ADDITIONAL_CXXFLAGS) $(INCLUDES) + + # Shared linking flags. +- LDFLAGS = $(ADDITIONAL_LDFLAGS) -L$(SRILM_LIBDIR) ++ LDFLAGS += $(ADDITIONAL_LDFLAGS) -L$(SRILM_LIBDIR) + + # Other useful compilation flags. + ADDITIONAL_CFLAGS = @@ -49,8 +49,8 @@ RLD_FLAG = -R |