diff options
| author | Yuri Victorovich <yuri@FreeBSD.org> | 2021-12-17 20:41:24 -0800 |
|---|---|---|
| committer | Yuri Victorovich <yuri@FreeBSD.org> | 2021-12-17 20:42:27 -0800 |
| commit | 57856f23e9fc79801a2115f0026e12f9c9fa286b (patch) | |
| tree | da1790be58b8ab9dd0ddd0c029436867677fec89 | |
| parent | net/py-python-socks: Update to 2.0.1 (diff) | |
math/gecode: Fix build for the GIST option.
Diffstat (limited to '')
| -rw-r--r-- | math/gecode/Makefile | 1 | ||||
| -rw-r--r-- | math/gecode/files/patch-Makefile.in | 11 | ||||
| -rw-r--r-- | math/gecode/files/patch-configure | 20 |
3 files changed, 32 insertions, 0 deletions
diff --git a/math/gecode/Makefile b/math/gecode/Makefile index 7ebbcd10dabd..419c2c92831b 100644 --- a/math/gecode/Makefile +++ b/math/gecode/Makefile @@ -49,6 +49,7 @@ GIST_CONFIGURE_ENABLE= gist qt GIST_USES= gl qt:5 GIST_USE= gl=gl qt=core,gui,printsupport,widgets,qmake_build,buildtools_build GIST_IMPLIES= SHARED # because Qt must be built in a special way: error: "You must build your code with position independent code if Qt was built with -reduce-relocations" +GIST_MAKE_ARGS= FREEBSD_LDFLAGS=-L${LOCALBASE}/lib PEAKHEAP_DESC= Peak heap size tracking PEAKHEAP_CONFIGURE_ENABLE= peakheap diff --git a/math/gecode/files/patch-Makefile.in b/math/gecode/files/patch-Makefile.in new file mode 100644 index 000000000000..683ca3df1eaa --- /dev/null +++ b/math/gecode/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2021-12-18 04:22:38 UTC ++++ Makefile.in +@@ -77,7 +77,7 @@ export QT_CPPFLAGS = @QTDEFINES@ @QTINCLUDES@ + export LINKQT = @QTLIBS@ + export MPFR_CPPFLAGS = @GMP_CPPFLAGS@ @MPFR_CPPFLAGS@ + ifeq "@enable_mpfr@" "yes" +-export LINKMPFR = @MPFR_LIB_PATH@ @GMP_LIB_PATH@ @MPFR_LINK@ @GMP_LINK@ ++export LINKMPFR = $(FREEBSD_LDFLAGS) @MPFR_LIB_PATH@ @GMP_LIB_PATH@ @MPFR_LINK@ @GMP_LINK@ + else + export LINKMPFR = + endif diff --git a/math/gecode/files/patch-configure b/math/gecode/files/patch-configure new file mode 100644 index 000000000000..c494bdabbf39 --- /dev/null +++ b/math/gecode/files/patch-configure @@ -0,0 +1,20 @@ +--- configure.orig 2021-05-20 06:12:58 UTC ++++ configure +@@ -12552,7 +12552,7 @@ if test "${enable_qt+set}" = set; then : + enableval=$enable_qt; + fi + +- for ac_prog in qmake-qt4 qmake ++ for ac_prog in qmake-qt5 qmake + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +@@ -12594,7 +12594,7 @@ fi + test -n "$QMAKE" && break + done + +- for ac_prog in moc-qt4 moc ++ for ac_prog in moc-qt5 moc + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 |