diff options
| author | Mikhail Teterin <mi@FreeBSD.org> | 2021-01-01 04:21:52 +0800 |
|---|---|---|
| committer | Mikhail Teterin <mi@FreeBSD.org> | 2021-01-01 04:21:52 +0800 |
| commit | e7321bbe776f897469272dbd35e5f98c52b59679 (patch) | |
| tree | 46b3482eca9bee0b8dc1e540cf971843ed9ee3ae /lang | |
| parent | b55d47cf5e52be677a6900d67559b3fe7d179be6 (diff) | |
| download | freebsd-ports-gnome-e7321bbe776f897469272dbd35e5f98c52b59679.tar.gz freebsd-ports-gnome-e7321bbe776f897469272dbd35e5f98c52b59679.tar.zst freebsd-ports-gnome-e7321bbe776f897469272dbd35e5f98c52b59679.zip | |
Start searching for headers and libraries under ${LOCALBASE}/ --
in case newer implementations of anything are installed there.
When compiling on 13.x or above, insist on libgnuregex version above
5 -- earlier FreeBSD releases came with libgnuregex.so.5, but that's
now gone and replaced by the devel/libgnuregex port, which currently
installs libgnuregex.so.6.
PR: 252252 252250 252245
Submitted by: kevans
Sponsored by: United Marsupials
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/scm/Makefile | 4 | ||||
| -rw-r--r-- | lang/scm/files/patch-build.scm | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lang/scm/Makefile b/lang/scm/Makefile index d6f5a9cfe0c5..9cd817fadaac 100644 --- a/lang/scm/Makefile +++ b/lang/scm/Makefile @@ -56,6 +56,10 @@ SCM_MODULES_X11=x.so .include <bsd.port.pre.mk> +.if ${OSVERSION} > 1300000 +LIB_DEPENDS+= libgnuregex.so.[6-9]:devel/libgnuregex +.endif + .if ${PORT_OPTIONS:MX11} SCM_MODULES+= ${SCM_MODULES_X11} SCM_DATA+= ${SCM_DATA_X11} diff --git a/lang/scm/files/patch-build.scm b/lang/scm/files/patch-build.scm index 0c582c235504..ce11bd21f8be 100644 --- a/lang/scm/files/patch-build.scm +++ b/lang/scm/files/patch-build.scm @@ -9,7 +9,8 @@ (m freebsd "" "-lm" #f () ()) - (curses freebsd "" "-lncurses" "/usr/lib/libncurses.a" () ()) + (curses freebsd "" "-lcurses" "/usr/lib/libcurses.a" () ()) - (regex freebsd "-I/usr/include/gnu" "-lgnuregex" "" () ()) +- (regex freebsd "-I/usr/include/gnu" "-lgnuregex" "" () ()) ++ (regex freebsd "-I%%LOCALBASE%%/include" "-lgnuregex" "" () ()) (editline freebsd "" "-lreadline" "" () ()) - (dlll freebsd "-DSUN_DL" "-export-dynamic" "" () ()) - (nostart freebsd "" "-e start -dc -dp -Bstatic -lgnumalloc" #f ("pre-crt0.c") ()) @@ -56,7 +57,7 @@ (cond ((equal? (car fnames) "edline") "-lreadline") - ((equal? (car fnames) "x") "-L/usr/X11R6/lib -lSM -lICE -lXext -lX11 -lxpg4") -+ ((equal? (car fnames) "rgx") "-lgnuregex") ++ ((equal? (car fnames) "rgx") "-L%%LOCALBASE%%/lib -lgnuregex") + ((equal? (car fnames) "x") "-L%%LOCALBASE%%/lib -lSM -lICE -lXext -lX11") (else "")) "-o" (string-append (car fnames) ".so") |