diff options
| author | sjmulder <sjmulder@pkgsrc.org> | 2019-06-10 10:40:52 +0000 |
|---|---|---|
| committer | sjmulder <sjmulder@pkgsrc.org> | 2019-06-10 10:40:52 +0000 |
| commit | 84eb0868e23b0df6d1b960cd9753e29fc2d05a06 (patch) | |
| tree | 774a47f84277548f9b6ef37d04e61e6924125372 /math | |
| parent | f29e315a4f69c00dcbf4191250c7f4528b5b8d85 (diff) | |
| download | pkgsrc-84eb0868e23b0df6d1b960cd9753e29fc2d05a06.tar.gz | |
math/sc-im: use LDLIBS to fix Ubuntu build
The build on Ubuntu 14.04 and 18.04 failed on undefined references to
libxls functions caused by having the -l at the beginning of the
argument list, injected into LDFLAGS, rather than at the end, where
LDLIBS ends up.
Diffstat (limited to 'math')
| -rw-r--r-- | math/sc-im/Makefile | 5 | ||||
| -rw-r--r-- | math/sc-im/options.mk | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/math/sc-im/Makefile b/math/sc-im/Makefile index 494783806ee..a27a4aa6312 100644 --- a/math/sc-im/Makefile +++ b/math/sc-im/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2019/05/06 09:17:12 sjmulder Exp $ +# $NetBSD: Makefile,v 1.5 2019/06/10 10:40:52 sjmulder Exp $ DISTNAME= sc-im-0.7.0 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_GITHUB:=andmarti1424/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -26,6 +26,7 @@ MAKE_ENV+= CFLAGS_CURSES=${BUILDLINK_CFLAGS.ncursesw:Q} MAKE_ENV+= LDLIBS_CURSES=${BUILDLINK_LDADD.ncursesw:Q} MAKE_ENV+= CFLAGS_DL=${BUILDLINK_CFLAGS.dl:Q} MAKE_ENV+= LDLIBS_DL=${BUILDLINK_LDADD.dl:Q} +MAKE_ENV+= LDLIBS=${LDLIBS:Q} # defaults to scim MAKE_FLAGS+= name=sc-im diff --git a/math/sc-im/options.mk b/math/sc-im/options.mk index 45bdde3076e..f1d481042d2 100644 --- a/math/sc-im/options.mk +++ b/math/sc-im/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2019/02/11 22:01:18 leot Exp $ +# $NetBSD: options.mk,v 1.3 2019/06/10 10:40:52 sjmulder Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.sc-im PKG_SUPPORTED_OPTIONS+= color xls xlsx lua @@ -12,13 +12,13 @@ CFLAGS+= -DUSECOLORS .if !empty(PKG_OPTIONS:Mxls) CFLAGS+= -DXLS -LDFLAGS+= -lxlsreader +LDLIBS+= -lxlsreader .include "../../textproc/libxls/buildlink3.mk" .endif .if !empty(PKG_OPTIONS:Mxlsx) CFLAGS+= -DXLSX -DXLSX_EXPORT -LDFLAGS+= -lxlsxwriter +LDLIBS+= -lxlsxwriter .include "../../archivers/libzip/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxlsxwriter/buildlink3.mk" |