From owner-svn-ports-all@freebsd.org Fri Jan 26 18:33:10 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D8AB9EC235C; Fri, 26 Jan 2018 18:33:09 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 739AD812A9; Fri, 26 Jan 2018 18:33:09 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6E02C1F417; Fri, 26 Jan 2018 18:33:09 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0QIX9DI026864; Fri, 26 Jan 2018 18:33:09 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0QIX9uA026861; Fri, 26 Jan 2018 18:33:09 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <201801261833.w0QIX9uA026861@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Fri, 26 Jan 2018 18:33:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r460047 - in head/editors/openoffice-4: . files X-SVN-Group: ports-head X-SVN-Commit-Author: truckman X-SVN-Commit-Paths: in head/editors/openoffice-4: . files X-SVN-Commit-Revision: 460047 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jan 2018 18:33:10 -0000 Author: truckman Date: Fri Jan 26 18:33:08 2018 New Revision: 460047 URL: https://svnweb.freebsd.org/changeset/ports/460047 Log: Don't enable crashdumps by default. This build knob causes the build to be done with debug symbols, which greatly increase the size of the build, but this is all in vain because the executables and libraries are subsequently stripped. Build with debug symbols if WITH_DEBUG is set. Build with -fstack-protector. Only fetch unowinreg.dll when building the SDK. Add three new options: CRASHDUMP - Enable crashdumps, requires WITH_DEBUG DBGUTIL - Enable assertions, object counting, and other non-production runtime debugging. DEBUG - Compile with -O0 for better debugability. The ports framework also sets WITH_DEBUG. Fold a couple long lines in the Makefile. Modified: head/editors/openoffice-4/Makefile head/editors/openoffice-4/files/patch-solenv_gbuild_platform_freebsd.mk head/editors/openoffice-4/files/patch-solenv_inc_unxfbsd.mk Modified: head/editors/openoffice-4/Makefile ============================================================================== --- head/editors/openoffice-4/Makefile Fri Jan 26 18:13:52 2018 (r460046) +++ head/editors/openoffice-4/Makefile Fri Jan 26 18:33:08 2018 (r460047) @@ -3,7 +3,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors java MASTER_SITES= APACHE/openoffice/${PORTVERSION}/sources \ http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \ @@ -14,7 +14,7 @@ PKGNAMEPREFIX= ${LANG_PKGNAME}- .if defined(LANG_SUFFIX) PKGNAMESUFFIX= -${LANG_SUFFIX} .endif -DISTFILES= ${AOOSRC} unowinreg.dll:unoreg ${EXTSRC}:extsrc +DISTFILES= ${AOOSRC} ${EXTSRC}:extsrc DIST_SUBDIR= openoffice EXTRACT_ONLY= ${AOOSRC} @@ -138,17 +138,27 @@ WITHOUT_CPU_CFLAGS= true CPE_PRODUCT= ${PORTNAME:S|apache-||} CPE_VENDOR= apache -OPTIONS_DEFINE= CUPS GNOME GNOMEVFS MMEDIA SDK WIKI_PUBLISHER +OPTIONS_DEFINE= CRASHDUMP CUPS DBGUTIL DEBUG GNOME GNOMEVFS MMEDIA \ + SDK WIKI_PUBLISHER OPTIONS_DEFAULT= CUPS GNOME GNOMEVFS MMEDIA WIKI_PUBLISHER +CRASHDUMP_DESC= Enable crashdumps, requires WITH_DEBUG +DBGUTIL_DESC= Enable assertions, object counting. (non-production) +DEBUG_DESC= Compile with -O0, sets WITH_DEBUG GNOME_DESC= GConf + screensaver presentation control via DBUS GNOMEVFS_DESC= GNOME Virtual File System MMEDIA_DESC= Multimedia backend for impress SDK_DESC= Build and install software development kit WIKI_PUBLISHER_DESC= Build and install Wiki Publisher extension +CRASHDUMP_CONFIGURE_ENABLE= crashdump + CUPS_CONFIGURE_ENABLE= cups CUPS_LIB_DEPENDS= libcups.so:print/cups +DBGUTIL_CONFIGURE_ENABLE= dbgutil + +DEBUG_CONFIGURE_ENABLE= debug + GNOME_CONFIGURE_ENABLE= dbus gconf lockdown GNOME_LIB_DEPENDS= libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib @@ -164,6 +174,7 @@ MMEDIA_LIB_DEPENDS= libgstreamer-0.10.so:multimedia/g MMEDIA_USE= GSTREAMER=yes SDK_CONFIGURE_ENABLE= odk +SDK_DISTFILES= unowinreg.dll:unoreg WIKI_PUBLISHER_CONFIGURE_ENABLE= wiki-publisher WIKI_PUBLISHER_CONFIGURE_WITH= \ @@ -183,6 +194,14 @@ TARGET_ORDER_OVERRIDE= 710:gnome-post-icons .include +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+= --enable-symbols +.else +.if ${PORT_OPTIONS:MCRASHDUMP} +BROKEN= CRASHDUMP option requires WITH_DEBUG +.endif +.endif + .include <${FILESDIR}/Makefile.localized> .if ${COMPILER_TYPE} == clang @@ -230,7 +249,6 @@ CONFIGURE_ARGS+= \ --with-system-cairo --enable-cairo \ --with-system-coinmp \ --with-system-curl \ - --enable-crashdump \ --with-system-dicts \ --with-epm=${LOCALBASE}/bin/epm \ --with-system-expat \ @@ -299,11 +317,15 @@ pre-everything:: ${TOUCH} ${BUILD_COOKIE} .endif +do-extract-SDK-on: + ${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/ + post-extract: ${TAR} -C ${WRKSUBDIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EXTSRC} - ${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/ - ${CP} ${FILESDIR}/freebsd-aoo-intro.png ${WRKSRC}/default_images/introabout/intro.png - ${CP} ${FILESDIR}/freebsd-aoo-about.png ${WRKSRC}/default_images/introabout/about.png + ${CP} ${FILESDIR}/freebsd-aoo-intro.png \ + ${WRKSRC}/default_images/introabout/intro.png + ${CP} ${FILESDIR}/freebsd-aoo-about.png \ + ${WRKSRC}/default_images/introabout/about.png ${RM} -r ${WRKSRC}/l10n ${LN} -sf ${UNZIP_CMD} ${WRKSRC}/solenv/bin/unzip ${SED} -e '\|^For main/vcl/unx/generic/fontmanager/parseAFM|,/^__/p' \ @@ -410,7 +432,9 @@ do-build: do-install: @${MKDIR} ${STAGEDIR}${PRINSTALLATION_BASEDIR} \ ${STAGEDIR}${PREFIX}/share/mime/packages - @cd ${WRKSRC}/instsetoo_native/unxfbsd*.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/ ; \ + @cd ${WRKSRC} ; \ + . ${FREEBSD_ENV_SET} ; \ + cd instsetoo_native/$${INPATH}/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/ ; \ for i in *.tar.?z ; do \ ${ECHO_CMD} "extracting $$i" ; \ ${TAR} -s '|./[^/]*/||' -xz -f $$i \ @@ -434,7 +458,9 @@ do-install: done @${ECHO_CMD} "adding desktop support" @${LN} -sf ${XDGREL} ${STAGEDIR}${DESKTOPDIR}/${EXECBASE} - @cd ${WRKSRC}/sysui/unxfbsd*.pro/misc/openoffice ; \ + @cd ${WRKSRC} ; \ + . ${FREEBSD_ENV_SET} ; \ + cd sysui/$${INPATH}/misc/openoffice ; \ DESTDIR=${STAGEDIR} \ GNOMEDIR=${PREFIX} \ ICON_PREFIX=openoffice${AOOVERSION1} \ Modified: head/editors/openoffice-4/files/patch-solenv_gbuild_platform_freebsd.mk ============================================================================== --- head/editors/openoffice-4/files/patch-solenv_gbuild_platform_freebsd.mk Fri Jan 26 18:13:52 2018 (r460046) +++ head/editors/openoffice-4/files/patch-solenv_gbuild_platform_freebsd.mk Fri Jan 26 18:33:08 2018 (r460047) @@ -8,3 +8,16 @@ -pipe ifeq ($(COM),CLANG) gb_CXXFLAGS += -DHAVE_STL_INCLUDE_PATH +@@ -142,6 +143,12 @@ gb_LinkTarget_LDFLAGS += \ + -Wl,--dynamic-list-cpp-typeinfo \ + -Wl,-Bsymbolic-functions \ + ++endif ++ ++ifneq ($(filter $(CPUNAME),INTEL X86_64),) ++gb_CFLAGS += -fstack-protector ++gb_CXXFLAGS += -fstack-protector ++gb_LinkTarget_LDFLAGS += -fstack-protector + endif + + ifeq ($(gb_DEBUGLEVEL),2) Modified: head/editors/openoffice-4/files/patch-solenv_inc_unxfbsd.mk ============================================================================== --- head/editors/openoffice-4/files/patch-solenv_inc_unxfbsd.mk Fri Jan 26 18:13:52 2018 (r460046) +++ head/editors/openoffice-4/files/patch-solenv_inc_unxfbsd.mk Fri Jan 26 18:33:08 2018 (r460047) @@ -1,6 +1,6 @@ --- solenv/inc/unxfbsd.mk.orig 2017-11-27 13:50:28 UTC +++ solenv/inc/unxfbsd.mk -@@ -96,7 +96,7 @@ CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs +@@ -96,10 +96,15 @@ CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs CFLAGS_NO_EXCEPTIONS=-fno-exceptions # -fpermissive should be removed as soon as possible @@ -9,3 +9,11 @@ .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" CFLAGSCXX += -fvisibility-inlines-hidden .ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" ++ ++.IF "$(CPUNAME)" == "INTEL" || "$(CPUNAME)" == "X86_64" ++CFLAGSCC += -fstack-protector ++CFLAGSCXX += -fstack-protector ++.ENDIF + + # Compiler flags for compiling static object in multi threaded environment with graphical user interface + CFLAGSOBJGUIMT=