Thu Jan 24 17:28:07 2019 UTC ()
don't eat -ldl unconditionally


(tnn)
diff -r1.179 -r1.180 pkgsrc/misc/libreoffice/Makefile
cvs diff -r1.179 -r1.180 pkgsrc/misc/libreoffice/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice/Makefile 2018/12/19 12:09:55 1.179
+++ pkgsrc/misc/libreoffice/Makefile 2019/01/24 17:28:07 1.180
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.179 2018/12/19 12:09:55 ryoon Exp $ 1# $NetBSD: Makefile,v 1.180 2019/01/24 17:28:07 tnn Exp $
2 2
3VERREL= 6.1.4 3VERREL= 6.1.4
4VERRC= 2 4VERRC= 2
5VER= ${VERREL}.${VERRC} 5VER= ${VERREL}.${VERRC}
6DISTNAME= libreoffice-${VER} 6DISTNAME= libreoffice-${VER}
7CATEGORIES= misc 7CATEGORIES= misc
8MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${VERREL}/ 8MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${VERREL}/
9EXTRACT_SUFX= .tar.xz 9EXTRACT_SUFX= .tar.xz
10 10
11MAINTAINER= ryoon@NetBSD.org 11MAINTAINER= ryoon@NetBSD.org
12HOMEPAGE= https://www.libreoffice.org/ 12HOMEPAGE= https://www.libreoffice.org/
13COMMENT= Office productivity suite from The Document Foundation 13COMMENT= Office productivity suite from The Document Foundation
14LICENSE= gnu-lgpl-v3 14LICENSE= gnu-lgpl-v3
@@ -220,27 +220,29 @@ LO_DESKTOP_FILES= calc.desktop draw.desk @@ -220,27 +220,29 @@ LO_DESKTOP_FILES= calc.desktop draw.desk
220#OBJDIR= pkgsrcbuild 220#OBJDIR= pkgsrcbuild
221#CONFIGURE_DIRS= ${OBJDIR} 221#CONFIGURE_DIRS= ${OBJDIR}
222CONFIGURE_SCRIPT= ${WRKSRC}/autogen.sh 222CONFIGURE_SCRIPT= ${WRKSRC}/autogen.sh
223 223
224#LD_LIBRARY_PATH+= ${WRKSRC}/instdir/sdk/lib:${WRKSRC}/instdir/ure/lib:${WRKSRC}/instdir/program 224#LD_LIBRARY_PATH+= ${WRKSRC}/instdir/sdk/lib:${WRKSRC}/instdir/ure/lib:${WRKSRC}/instdir/program
225 225
226MAKE_ENV+= ROOT_USER=${ROOT_USER} 226MAKE_ENV+= ROOT_USER=${ROOT_USER}
227MAKE_ENV+= ROOT_GROUP=${ROOT_GROUP} 227MAKE_ENV+= ROOT_GROUP=${ROOT_GROUP}
228MAKE_ENV+= SHELL=${BASH} 228MAKE_ENV+= SHELL=${BASH}
229#MAKE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH} 229#MAKE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
230BUILD_MAKE_FLAGS+= VERBOSE=true 230BUILD_MAKE_FLAGS+= VERBOSE=true
231#BUILD_MAKE_FLAGS+= GMAKE_OPTIONS+=-p 231#BUILD_MAKE_FLAGS+= GMAKE_OPTIONS+=-p
232 232
 233.if ${OPSYS} != "Linux"
233BUILDLINK_TRANSFORM+= rm:-ldl 234BUILDLINK_TRANSFORM+= rm:-ldl
 235.endif
234 236
235INSTALLATION_DIRS= bin share/applications 237INSTALLATION_DIRS= bin share/applications
236 238
237.PHONY: debugrun 239.PHONY: debugrun
238# For debugging 240# For debugging
239debugrun: 241debugrun:
240 cd ${WRKSRC} && gmake debugrun 242 cd ${WRKSRC} && gmake debugrun
241 243
242post-extract: 244post-extract:
243 ${MKDIR} -p ${WRKSRC}/src 245 ${MKDIR} -p ${WRKSRC}/src
244.for md in ${MORE_DISTFILES} 246.for md in ${MORE_DISTFILES}
245 ${LN} -s ${DISTDIR}/${DIST_SUBDIR}/${md} ${WRKSRC}/src/${md} 247 ${LN} -s ${DISTDIR}/${DIST_SUBDIR}/${md} ${WRKSRC}/src/${md}
246.endfor 248.endfor