CVS commit: pkgsrc/math/sc-im

["Sijmen J. Mulder" <sjmulder%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   sjmulder
Date:           Mon Jun 10 10:40:52 UTC 2019

Modified Files:
        pkgsrc/math/sc-im: Makefile options.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/math/sc-im/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/math/sc-im/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/sc-im/Makefile
diff -u pkgsrc/math/sc-im/Makefile:1.4 pkgsrc/math/sc-im/Makefile:1.5
--- pkgsrc/math/sc-im/Makefile:1.4      Mon May  6 09:17:12 2019
+++ pkgsrc/math/sc-im/Makefile  Mon Jun 10 10:40:52 2019
@@ -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_CFL
 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

Index: pkgsrc/math/sc-im/options.mk
diff -u pkgsrc/math/sc-im/options.mk:1.2 pkgsrc/math/sc-im/options.mk:1.3
--- pkgsrc/math/sc-im/options.mk:1.2    Mon Feb 11 22:01:18 2019
+++ pkgsrc/math/sc-im/options.mk        Mon Jun 10 10:40:52 2019
@@ -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"