Date: Sun, 21 Jun 2020 14:55:10 +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: r539769 - in head/www/rejik: . files Message-ID: <202006211455.05LEtAII007778@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Sun Jun 21 14:55:10 2020 New Revision: 539769 URL: https://svnweb.freebsd.org/changeset/ports/539769 Log: www/rejik: Unbreak build with GCC 10 /usr/local/bin/ld: pass.o:(.bss+0x0): multiple definition of `change_log'; /tmp/ccMvpVPD.o:(.bss+0x0): first defined here .. and so on ... http://package22.nyi.freebsd.org/data/113amd64-default-PR244008/2020-06-10_18h05m01s/logs/errors/rejik-3.2.11_8.log - Respect CFLAGS/LDFLAGS - GCC 10 switched to -fno-common by default and this port is not ready in any way. Since this is also abandonware it should probably be retired. For now go back to -fcommon. PR: 246700 Modified: head/www/rejik/Makefile head/www/rejik/files/patch-Makefile Modified: head/www/rejik/Makefile ============================================================================== --- head/www/rejik/Makefile Sun Jun 21 14:43:48 2020 (r539768) +++ head/www/rejik/Makefile Sun Jun 21 14:55:10 2020 (r539769) @@ -3,7 +3,7 @@ PORTNAME= rejik PORTVERSION= 3.2.11 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= www MASTER_SITES= http://www.rejik.ru/download/ DISTNAME= redirector-${PORTVERSION}_squid_3.4 @@ -19,6 +19,7 @@ LIB_DEPENDS= libpcre.so:devel/pcre USES= perl5 tar:tgz USE_GCC= any MAKE_ARGS= CC=${CC} INSTALL_PATH=${PREFIX}/rejik3 +CFLAGS+= -fcommon USERS= squid GROUPS= squid Modified: head/www/rejik/files/patch-Makefile ============================================================================== --- head/www/rejik/files/patch-Makefile Sun Jun 21 14:43:48 2020 (r539768) +++ head/www/rejik/files/patch-Makefile Sun Jun 21 14:55:10 2020 (r539769) @@ -1,6 +1,21 @@ --- Makefile.orig 2013-11-15 10:28:02 UTC +++ Makefile -@@ -40,36 +40,35 @@ cygwin: clean cygwin_vars ${REDIRECTOR_O +@@ -13,11 +13,11 @@ REDIRECTOR_OBJ= pass.o raw_change.o load_cache.o pcre. + MAKE-CACHE_OBJ= load_urls.o prune_urls.o write_cache.o need_cache_update.o ${COMMON_OBJ} + + .c.o: vars.h +- ${CC} ${INCLUDE} -c $< ++ ${CC} ${CFLAGS} ${INCLUDE} -c $< + + all: clean ${REDIRECTOR_OBJ} ${MAKE-CACHE_OBJ} +- ${CC} ${INCLUDE} -o redirector redirector.c ${REDIRECTOR_OBJ} ${LIBS} +- ${CC} ${INCLUDE} -o make-cache make-cache.c ${MAKE-CACHE_OBJ} ${LIBS} ++ ${CC} ${LDFLAGS} ${INCLUDE} -o redirector redirector.c ${REDIRECTOR_OBJ} ${LIBS} ++ ${CC} ${LDFLAGS} ${INCLUDE} -o make-cache make-cache.c ${MAKE-CACHE_OBJ} ${LIBS} + + clean: + rm -f ${REDIRECTOR_OBJ} ${MAKE-CACHE_OBJ} redirector make-cache OUT rejik3.zip rejik3/* +@@ -40,36 +40,35 @@ cygwin: clean cygwin_vars ${REDIRECTOR_OBJ} ${MAKE-CAC install: # Make dirs
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006211455.05LEtAII007778>