Date: Sat, 6 Jun 2020 14:59:49 +0000 (UTC) From: "Serhii (Sergey) Kozlov" <skozlov@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538096 - in head/devel/staf: . files Message-ID: <202006061459.056ExnA9055117@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: skozlov Date: Sat Jun 6 14:59:48 2020 New Revision: 538096 URL: https://svnweb.freebsd.org/changeset/ports/538096 Log: Unbreak devel/staf After r533459 functionality that automatically un-zips the zipped patches in Mk/Scripts/do-patch.sh started working. This caused makefile.zip patches to be treated as compressed, even though they're not. Changing the patch name fixes the issue as the do-patch.sh doesn't see it as a .zip file anymore Added: head/devel/staf/files/patch-services_zip_makefile-zip - copied unchanged from r538095, head/devel/staf/files/patch-services_zip_makefile.zip Deleted: head/devel/staf/files/patch-services_zip_makefile.zip Modified: head/devel/staf/Makefile Modified: head/devel/staf/Makefile ============================================================================== --- head/devel/staf/Makefile Sat Jun 6 14:24:22 2020 (r538095) +++ head/devel/staf/Makefile Sat Jun 6 14:59:48 2020 (r538096) @@ -14,8 +14,6 @@ COMMENT= Software Testing Automation Framework LICENSE= EPL LICENSE_FILE= ${WRKSRC}/LICENSE.htm -BROKEN= fails to build - WRKSRC= ${WRKDIR}/src WRKSRC_SUBDIR= ${PORTNAME} INSTALL_WRKSRC= ${WRKDIR}/rel/freebsd/staf/${STAF_BUILD_TYPE} Copied: head/devel/staf/files/patch-services_zip_makefile-zip (from r538095, head/devel/staf/files/patch-services_zip_makefile.zip) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/staf/files/patch-services_zip_makefile-zip Sat Jun 6 14:59:48 2020 (r538096, copy of r538095, head/devel/staf/files/patch-services_zip_makefile.zip) @@ -0,0 +1,121 @@ +--- services/zip/makefile.zip.orig 2015-09-28 13:33:59 UTC ++++ services/zip/makefile.zip +@@ -15,14 +15,19 @@ CleanupTargets += cleanup_stafzip + $(stafzip_targets): SUBSYS_REL := services/zip + SUBSYS_REL := services/zip + ++# Location of zlib headers ++ZLIB_INCLUDEDIRS ?= $(ZLIB_ROOT:/=)/include ++# Name of the zip library to link against ++ZLIB_LIBNAME=z ++ + #===================================================================== + # C/C++ Info Flags + #===================================================================== + + $(stafzip_targets): OBJS = $(stafzip_objs) +-$(stafzip_targets): LIBS = STAF STAFZlib ++$(stafzip_targets): LIBS = STAF $(ZLIB_LIBNAME) + $(stafzip_targets): CFLAGS := $(CC_EXPORT_SHARED_LIB_SYMBOLS) +-$(stafzip_targets): INCLUDEDIRS := $(ZLIB_SOURCEDIR) ++$(stafzip_targets): INCLUDEDIRS := $(ZLIB_INCLUDEDIRS) + + stafzip_objs :=\ + STAFZip\ +@@ -43,7 +48,7 @@ stafzip_objs :=\ + stafzip_objs := $(foreach obj,$(stafzip_objs),$(O)/services/zip/$(obj)$(OS_OE)) + stafzip_dependents := $(stafzip_objs:$(OS_OE)=.d) + $(stafzip_dependents): SUBSYS_REL := services/zip +-$(stafzip_dependents): INCLUDEDIRS := $(ZLIB_SOURCEDIR) ++$(stafzip_dependents): INCLUDEDIRS := $(ZLIB_INCLUDEDIRS) + + ifeq ($(OS_NAME),win32) + stafzip_objs += $(SR_SRC)/STAFZip.def +@@ -61,86 +66,8 @@ include $(InferenceRules) + + # STAFZIP targets + +-$(REL)/lib/$(LIB_STAFZIP): $(stafzip_objs) $(LIB_STAF_FP) $(REL)/lib/$(subst Name,STAFZlib,$(DLL)) $(MAKEFILE_NAME) ++$(REL)/lib/$(LIB_STAFZIP): $(stafzip_objs) $(LIB_STAF_FP) $(MAKEFILE_NAME) + $(SHARED_LIB_IT) + + cleanup_stafzip: + -@$(DEL) $(O)/services/zip/* $(OUT_ERR_TO_DEV_NULL) +- +- +-#===================================================================== +-# zLib section +-#===================================================================== +- +-LIB_STAFZLIB = $(subst Name,STAFZlib,$(DLL)) +- +-stafzlib_targets += $(REL)/lib/$(LIB_STAFZLIB) +- +-Targets += $(stafzlib_targets) +-CleanupTargets += cleanup_stafzlib +- +-$(stafzlib_targets): SUBSYS_REL := libs/zlib +-SUBSYS_REL := libs/zlib +- +-#===================================================================== +-# C/C++ Info Flags +-#===================================================================== +- +-$(stafzlib_targets): OBJS = $(stafzlib_objs) +-$(stafzlib_targets): LIBS = +-$(stafzlib_targets): CFLAGS := $(CC_EXPORT_SHARED_LIB_SYMBOLS) +- +-# The Solaris gcc compiler does not support the GNU C extension attribute, +-# visibility (*hidden*), which is used by zlib 1.2.5 source code. Setting +-# the NO_VIZ compiler flag resolves this problem when building zlib on +-# Solaris. +- +-ifeq ($(OS_NAME),solaris) +- $(stafzlib_targets): CFLAGS += -DNO_VIZ +-endif +- +-$(stafzlib_targets): LIBDIRS = $(SR_SRC) +- +-stafzlib_objs :=\ +- zutil\ +- uncompr\ +- trees\ +- inftrees\ +- inflate\ +- inffast\ +- infback\ +- gzclose\ +- gzread\ +- gzwrite\ +- gzlib\ +- deflate\ +- crc32\ +- compress\ +- adler32 +- +-stafzlib_objs := $(foreach obj,$(stafzlib_objs),$(O)/libs/zlib/$(obj)$(OS_OE)) +-stafzlib_dependents := $(stafzlib_objs:$(OS_OE)=.d) +-$(stafzlib_dependents): SUBSYS_REL := libs/zlib +- +-ifeq ($(OS_NAME),win32) +- stafzlib_objs += $(ZLIB_SOURCEDIR)/win32/zlib.def +-endif +- +-# Include dependencies +-ifneq ($(InCleanup), "1") +- include $(stafzlib_dependents) +-endif +- +-# Include inference rules +-$(O)/$(SUBSYS_REL)/%$(OS_OE): $(ZLIB_SOURCEDIR)/%.c +- $(COMPILE_IT_C) +-$(O)/$(SUBSYS_REL)/%.d: $(ZLIB_SOURCEDIR)/%.c +- $(C_DEPEND_IT_C) +- +-# STAFZLIB targets +- +-$(REL)/lib/$(LIB_STAFZLIB): $(stafzlib_objs) $(LIB_STAF_FP) $(MAKEFILE_NAME) +- $(SHARED_LIB_IT) +- +-cleanup_stafzlib: +- -@$(DEL) $(O)/libs/zlib/* $(OUT_ERR_TO_DEV_NULL)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006061459.056ExnA9055117>