pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

pkglint fixes

Module Name:	pkgsrc-wip
Committed By:	H William Welliver <william%welliver.org@localhost>
Pushed By:	hww3
Date:		Fri Jun 12 19:49:26 2020 -0400
Changeset:	446c6d5adfd2968df89c218811bbd865e71b5c41

Modified Files:
	pike8.0/Makefile
	pike8.0/builtin_module.mk
	pike8.0/distinfo
	pike8.0/patches/patch-src_Makefile.in

Log Message:
pkglint fixes

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

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

diffstat:
 pike8.0/Makefile                      |  8 ++++----
 pike8.0/builtin_module.mk             | 34 ++++++++++++++++++++--------------
 pike8.0/distinfo                      |  2 +-
 pike8.0/patches/patch-src_Makefile.in |  2 ++
 4 files changed, 27 insertions(+), 19 deletions(-)

diffs:
diff --git a/pike8.0/Makefile b/pike8.0/Makefile
index 17c9eb59d1..ca84f02f43 100644
--- a/pike8.0/Makefile
+++ b/pike8.0/Makefile
@@ -16,9 +16,9 @@ HOMEPAGE=	https://pike.lysator.liu.se/
 COMMENT=	Dynamic language with a syntax similar to Java and C
 
 CHECK_SSP=	no
-# pike performs dynamic allocation and machine code generation, 
+# pike performs dynamic allocation and machine code generation,
 # so leaving SSP enabled causes problems.
-SSP_SUPPORTED=  no
+SSP_SUPPORTED=	no
 
 BUILD_DEPENDS+=		pkgconf-[0-9]*:../../devel/pkgconf
 BUILD_DEPENDS+=		pkg_alternatives-[0-9]*:../../pkgtools/pkg_alternatives
@@ -35,8 +35,8 @@ SHARED_DOCS_LOC=	${PREFIX}/share/doc/${NAME}
 INSTALL_SHARED_DOCS=	ANNOUNCE CHANGES COMMITTERS COPYING COPYRIGHT README README-GIT
 
 INSTALL_TARGET_ARGS+=	INSTALLARGS="buildroot='${DESTDIR}' prefix='${PREFIX}' \
-	include_prefix='${PREFIX}/include/${NAME}' \
-	lib_prefix='${PREFIX}/lib/${NAME}' --verbose --traditional"
+			include_prefix='${PREFIX}/include/${NAME}' \
+			lib_prefix='${PREFIX}/lib/${NAME}' --verbose --traditional"
 INSTALL_TARGET_ARGS+=	buildroot='${DESTDIR}' prefix='${PREFIX}'
 
 .if (defined(ABI))
diff --git a/pike8.0/builtin_module.mk b/pike8.0/builtin_module.mk
index 4fb300290c..605e37040f 100644
--- a/pike8.0/builtin_module.mk
+++ b/pike8.0/builtin_module.mk
@@ -30,10 +30,9 @@ DISTNAME=	Pike-v${PIKE_VERSION}
 PIKE_EXECUTABLE=	pike${PIKEVERSUFFIX}
 
 CHECK_SSP=	no
-.if defined(PKGSRC_USE_SSP)
-# do not add flags to everything
-PKGSRC_USE_SSP=	no
-.endif
+# pike performs dynamic allocation and machine code generation,
+# so leaving SSP enabled causes problems.
+SSP_SUPPORTED=	no
 
 CATEGORIES=	lang
 MASTER_SITES=	http://pike.lysator.liu.se/pub/pike/${PIKE_RELEASE_TYPE}/${PIKE_VERSION}/
@@ -54,7 +53,8 @@ PIKE_MODULE_OVERLAPPING_FILES=
 SYSTEM_MODULE_PATH!=	pike${PIKEVERSUFFIX} -x module --query=system_module_path
 SYSTEM_DOC_PATH=	${PREFIX}/share/pike${PIKEVERSUFFIX}/refdoc
 
-EXTRACT_ELEMENTS+=	${DISTNAME}/src/${MODULE_TYPE}s/${INTERNAL_MODULENAME} ${DISTNAME}/refdoc
+EXTRACT_ELEMENTS+=	${DISTNAME}/src/${MODULE_TYPE}s/${INTERNAL_MODULENAME} \
+			${DISTNAME}/refdoc
 FILES_SUBST+=		NAME="${NAME}"
 FILES_SUBST+=		MODULENAME="${MODULENAME}"
 FILES_SUBST+=		MODULENAME="${INTERNAL_MODULENAME}"
@@ -64,9 +64,6 @@ FILES_SUBST+=		PIKE_EXECUTABLE="${PIKE_EXECUTABLE}"
 # remove any dumped modules from the list, as their generation is not deterministic
 PRINT_PLIST_AWK+=	/^lib\/.*(\.pike\.o|\.pmod\.o)$$/ { next; }
 
-# add the dumped modules from this build
-#GENERATE_PLIST+=	cd ${DESTDIR}/${PREFIX} && find . -name \*.o -print | sed -e 's~^\./~~' ;
-
 do-configure:
 	cd ${WRKSRC}/${PIKE_MODULE_SRC} && ${PIKE_EXECUTABLE} -x module --configure
 	touch -t 201501010000 ${WRKSRC}/${PIKE_MODULE_SRC}/acconfig.h
@@ -78,20 +75,27 @@ do-build:
 # run some build checks and make the module modref if desired.
 post-build:
 .if(${CHECK_MODULE_ENABLED} != "no")
-	cd ${WRKSRC}/${PIKE_MODULE_SRC} && ${PIKE_EXECUTABLE} -e 'return !sizeof(indices(load_module("./module.so"))+indices(load_module("./module.so")()));' || (${ECHO} "Module empty, configure problem?" && exit 1)
+	cd ${WRKSRC}/${PIKE_MODULE_SRC} && ${PIKE_EXECUTABLE} \
+		-e 'return !sizeof(indices(load_module("./module.so"))+indices(load_module("./module.so")()));' \
+		|| (${ECHO} "Module empty, configure problem?" && exit 1)
 .endif
 .if(${MAKE_MODREF} != "no")
-	cd ${WRKSRC}/${PIKE_MODULE_SRC} && ${PIKE_EXECUTABLE} -x module SYSTEM_DOC_PATH=${SYSTEM_DOC_PATH} module_modref
+	cd ${WRKSRC}/${PIKE_MODULE_SRC} && ${PIKE_EXECUTABLE} \
+		-x module SYSTEM_DOC_PATH=${SYSTEM_DOC_PATH} module_modref
 .endif
 
 do-install:
 	${MKDIR} ${DESTDIR}${SYSTEM_MODULE_PATH}
 	cd ${WRKSRC}/${PIKE_MODULE_SRC} \
-	&& SYSTEM_MODULE_PATH=`${PIKE_EXECUTABLE} -x module --query=system_module_path` ${PIKE_EXECUTABLE} -x module SYSTEM_MODULE_PATH=${DESTDIR}${SYSTEM_MODULE_PATH} install
+	&& SYSTEM_MODULE_PATH=`${PIKE_EXECUTABLE} -x module --query=system_module_path` \
+		${PIKE_EXECUTABLE} -x module \
+		SYSTEM_MODULE_PATH=${DESTDIR}${SYSTEM_MODULE_PATH} install
 
-post-install: remove-dumped-modules remove-main-package-files prepare-docs-dir install-shared-docs install-modrefs
+post-install: remove-dumped-modules remove-main-package-files prepare-docs-dir \
+	install-shared-docs install-modrefs
 
-.PHONY: remove-main-package-files remove-dumped-modules prepare-docs-dir install-modrefs install-shared-docs
+.PHONY: remove-main-package-files remove-dumped-modules prepare-docs-dir \
+	install-modrefs install-shared-docs
 
 # remove files that overlap with files in the main pike package, located under PREFIX
 remove-main-package-files:
@@ -104,7 +108,9 @@ remove-main-package-files:
 	  fi
 
 remove-dumped-modules:
-	cd ${DESTDIR}/${PREFIX}/lib/pike${PIKEVERSUFFIX} && find . -type f | sed -n -e '/\.pmod\.o$$/p' -e '/\.pike\.o$$/p' | xargs -n 20 rm -f
+	cd ${DESTDIR}/${PREFIX}/lib/pike${PIKEVERSUFFIX} && \
+		find . -type f | sed -n -e '/\.pmod\.o$$/p' -e '/\.pike\.o$$/p' \
+		| xargs -n 20 rm -f
 
 prepare-docs-dir:
 	rm -rf ${DESTDIR}/${PREFIX}/doc
diff --git a/pike8.0/distinfo b/pike8.0/distinfo
index 277f6bfd99..6a0f3da662 100644
--- a/pike8.0/distinfo
+++ b/pike8.0/distinfo
@@ -4,4 +4,4 @@ SHA1 (Pike-v8.0.702.tar.gz) = d13793b05d659acd79c999252fcb5c454eaa4a4b
 RMD160 (Pike-v8.0.702.tar.gz) = 923eac1152e0c839aa17bf051c91c5c82b4cea56
 SHA512 (Pike-v8.0.702.tar.gz) = 67ee5a6af9e7ab1031c63647d0f351b6f9a29a736f6b049beada577997bab199d542d39c16c328a81ea52821555f8db9bd227caad55fed9c3613ba6718124e09
 Size (Pike-v8.0.702.tar.gz) = 18850526 bytes
-SHA1 (patch-src_Makefile.in) = 53d3d94cb51dcb7d95db9d4c746a5d56a6979eae
+SHA1 (patch-src_Makefile.in) = f50c9f14a7d5012a52d8afb884dea147faa278e8
diff --git a/pike8.0/patches/patch-src_Makefile.in b/pike8.0/patches/patch-src_Makefile.in
index 61f9fa3e7a..bb9c19ef38 100644
--- a/pike8.0/patches/patch-src_Makefile.in
+++ b/pike8.0/patches/patch-src_Makefile.in
@@ -1,5 +1,7 @@
 $NetBSD$
+
 NetBSD8 enables memprotect protections. Fixed in upstream source.
+
 --- src/Makefile.in.orig	2015-12-31 19:50:31.000000000 +0000
 +++ src/Makefile.in
 @@ -66,6 +66,8 @@ INSTALLARGS = --new-style
Home | Main Index | Thread Index | Old Index