pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/math/sc-im math/sc-im: use LDLIBS to fix Ubuntu build



details:   https://anonhg.NetBSD.org/pkgsrc/rev/797e6f8a82e6
branches:  trunk
changeset: 334961:797e6f8a82e6
user:      sjmulder <sjmulder%pkgsrc.org@localhost>
date:      Mon Jun 10 10:40:52 2019 +0000

description:
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:

 math/sc-im/Makefile   |  5 +++--
 math/sc-im/options.mk |  6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (46 lines):

diff -r 391fae124ea2 -r 797e6f8a82e6 math/sc-im/Makefile
--- a/math/sc-im/Makefile       Mon Jun 10 10:16:13 2019 +0000
+++ b/math/sc-im/Makefile       Mon Jun 10 10:40:52 2019 +0000
@@ -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+=     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 -r 391fae124ea2 -r 797e6f8a82e6 math/sc-im/options.mk
--- a/math/sc-im/options.mk     Mon Jun 10 10:16:13 2019 +0000
+++ b/math/sc-im/options.mk     Mon Jun 10 10:40:52 2019 +0000
@@ -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 @@
 
 .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"



Home | Main Index | Thread Index | Old Index