pkgsrc-WIP-changes archive

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

ksh93u+: minor changes; fix building on Solaris 11.



Module Name:	pkgsrc-wip
Committed By:	Paolo Vincenzo Olivo <vms%retrobsd.ddns.net@localhost>
Pushed By:	vms
Date:		Sat Jun 25 21:49:27 2022 +0200
Changeset:	f954e12d2a2bde4ae88fc97057131b0560db88b8

Modified Files:
	ksh93u+/Makefile

Log Message:
ksh93u+: minor changes; fix building on Solaris 11.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f954e12d2a2bde4ae88fc97057131b0560db88b8

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

diffstat:
 ksh93u+/Makefile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diffs:
diff --git a/ksh93u+/Makefile b/ksh93u+/Makefile
index 9bae63bb90..2053a6eb2b 100644
--- a/ksh93u+/Makefile
+++ b/ksh93u+/Makefile
@@ -17,12 +17,16 @@ CONFLICTS+=		ast-ksh-[0-9]* static-ast-ksh-[0-9]*
 
 USE_LANGUAGES=		c c++
 FORTIFY_SUPPORTED=	no
-MAKE_FLAGS+=		CC=${CC:Q} CCFLAGS=${CFLAGS:M*:Q}
+MAKEFLAGS+=		CC=${CC:Q} CCFLAGS=${CFLAGS:M*:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "NetBSD"
-MAKE_FLAGS+=	CCFLAGS=${CFLAGS:M*:Q} -D_NETBSD_SOURCE
+MAKEFLAGS+=	CCFLAGS="-D_NETBSD_SOURCE ${CFLAGS}"
+.endif
+
+.if ${OPSYS} == "SunOS"
+MAKEFLAGS+=	CCFLAGS="-std=c11 -D_XPG6 ${CFLAGS}"
 .endif
 
 PKG_SHELL=		bin/ksh93
@@ -34,7 +38,7 @@ WRKSRC=	${WRKDIR}/ksh-${DISTNAME:S,^v,,}
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${TOOLS_SHELL} ${WRKSRC}/bin/package \
-		make ${MAKE_FLAGS}
+		make ${MAKEFLAGS}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/arch/*/bin/ksh \


Home | Main Index | Thread Index | Old Index