Date: Sat, 18 Nov 2017 00:51:34 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r454404 - in head: . graphics/netpbm graphics/netpbm/files Message-ID: <201711180051.vAI0pYGk016796@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Sat Nov 18 00:51:34 2017 New Revision: 454404 URL: https://svnweb.freebsd.org/changeset/ports/454404 Log: graphics/netpbm: Fix build with older netpbm versions installed The build currently fails when older netpbm version are still installed in the build environment e.g. when upgrading from 10.35.98 to 10.80.00 the build fails with ppmtompeg.o: In function `main': ppmtompeg.c:(.text+0x9a5): undefined reference to `pm_strfree' ppmtompeg.o: In function `getUserFrameFile': ppmtompeg.c:(.text+0xcb1): undefined reference to `pm_asprintf' ppmtompeg.c:(.text+0xcfb): undefined reference to `pm_strfree' ppmtompeg.c:(.text+0xd04): undefined reference to `pm_strfree' - Use explicit paths when linking with libnetpbm - Remove UPDATING entry that previously recommended deinstalling netpbm first when using portmaster/portupgrade PR: 223724 Modified: head/UPDATING head/graphics/netpbm/Makefile head/graphics/netpbm/files/config.mk Modified: head/UPDATING ============================================================================== --- head/UPDATING Sat Nov 18 00:11:23 2017 (r454403) +++ head/UPDATING Sat Nov 18 00:51:34 2017 (r454404) @@ -149,18 +149,6 @@ you update your ports collection, before attempting an The HPN option is currently disabled by default, and does not build, in the package. This follows what happened in base as well. - 20171006: - AFFECTS: users of graphics/netpbm - AUTHOR: tobik@FreeBSD.org - - If you use portmaster/portupgrade/make to build your ports, please - uninstall the old netpbm version first before attempting to update to - netpbm 10.80.00: - - pkg delete -f netpbm - - It is recommended that you rebuild all dependent ports as well. - 20171004: AFFECTS: users of security/krb5-appl AUTHOR: cy@FreeBSD.org Modified: head/graphics/netpbm/Makefile ============================================================================== --- head/graphics/netpbm/Makefile Sat Nov 18 00:11:23 2017 (r454403) +++ head/graphics/netpbm/Makefile Sat Nov 18 00:51:34 2017 (r454404) @@ -87,7 +87,9 @@ post-patch: .endfor post-patch-STATIC-on: - @${REINPLACE_CMD} 's|$$(LD)|$$(LD) -static|g' ${WRKSRC}/common.mk + @${REINPLACE_CMD} -e 's|$$(LD)|$$(LD) -static|g' \ + -e 's@$$(NETPBMLIBFNAME)@libnetpbm.a@' \ + ${WRKSRC}/common.mk # Disable building svgtopam by default. It is the only program that # requires libxml2 and it is not useful in this day and age according Modified: head/graphics/netpbm/files/config.mk ============================================================================== --- head/graphics/netpbm/files/config.mk Sat Nov 18 00:11:23 2017 (r454403) +++ head/graphics/netpbm/files/config.mk Sat Nov 18 00:51:34 2017 (r454404) @@ -13,6 +13,7 @@ JBIGHDR_DIR = $(LOCALBASE)/include JBIGLIB = -L$(LOCALBASE)/lib -ljbig JPEGHDR_DIR = $(LOCALBASE)/include JPEGLIB = -L$(LOCALBASE)/lib -ljpeg +LINKER_CAN_DO_EXPLICIT_LIBRARY = Y LINKERISCOMPILER = Y NETPBMLIBSUFFIX = so NETPBMLIBTYPE = unixshared
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711180051.vAI0pYGk016796>