diff options
| author | tijl <tijl@FreeBSD.org> | 2014-08-12 23:29:37 +0800 |
|---|---|---|
| committer | tijl <tijl@FreeBSD.org> | 2014-08-12 23:29:37 +0800 |
| commit | 4cb8aa2cbc52a616e4f442310a09cc5f408303f3 (patch) | |
| tree | 88f5fc59ca92cb0cc696d418e8dff349c265467f /sysutils | |
| parent | 98e780c1c7270e84b6fb00c8eb4bdb03e6702f80 (diff) | |
| download | freebsd-ports-gnome-4cb8aa2cbc52a616e4f442310a09cc5f408303f3.tar.gz freebsd-ports-gnome-4cb8aa2cbc52a616e4f442310a09cc5f408303f3.tar.zst freebsd-ports-gnome-4cb8aa2cbc52a616e4f442310a09cc5f408303f3.zip | |
Fix problems with missing libs when the linker enforces explicit linking
(ports that are dependencies of other ports)
net-p2p/transmission-cli: add USES=libtool and remove PTHREAD_LIBS
sysutils/deltup: simplify patch by using MAKE_ARGS
x11-fm/rox-filer: convert to USES=shared-mime-info
x11-wm/emerald: remove PTHREAD_LIBS
PR: 192062
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/deltup/Makefile | 15 | ||||
| -rw-r--r-- | sysutils/deltup/files/patch-Makefile | 18 |
2 files changed, 12 insertions, 21 deletions
diff --git a/sysutils/deltup/Makefile b/sysutils/deltup/Makefile index 71d201f02103..b2657478bb88 100644 --- a/sysutils/deltup/Makefile +++ b/sysutils/deltup/Makefile @@ -27,6 +27,7 @@ BZIP2_103= 1.0.3 USE_OPENSSL= yes USES= gmake ALL_TARGET= deltup +MAKE_ARGS= CC="${CC}" CXX="${CXX}" PREFIX="${PREFIX}" PLIST_FILES= bin/deltup \ bin/bzip2_1.0.2 \ bin/bzip2_1.0.3 \ @@ -37,17 +38,17 @@ WRKSRC_BZIP2_103= ${WRKDIR}/bzip2-${BZIP2_103} PORTDOCS= ChangeLog README post-patch: - @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e 's/CC/CXX/' -e 's,gcc,$${CXX},' ${WRKSRC}/Makefile pre-build: @${REINPLACE_CMD} -e 's|-Wall -Winline -O2|-Wall -Winline -O2 ${CFLAGS}|' \ - -e 's|CC=gcc|CC?=gcc|' \ - ${WRKSRC_BZIP2_102}/Makefile + ${WRKSRC_BZIP2_102}/Makefile @${REINPLACE_CMD} -e 's|-Wall -Winline -O -g|-Wall -Winline -O2 ${CFLAGS}|' \ - -e 's|CC=gcc|CC?=gcc|' \ - ${WRKSRC_BZIP2_103}/Makefile - @cd ${WRKSRC_BZIP2_102}; ${MAKE_CMD} bzip2; \ - cd ${WRKSRC_BZIP2_103}; ${MAKE_CMD} bzip2; + ${WRKSRC_BZIP2_103}/Makefile + @(cd ${WRKSRC_BZIP2_102} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ + ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} bzip2) + @(cd ${WRKSRC_BZIP2_103} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ + ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} bzip2) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/deltup ${STAGEDIR}${PREFIX}/bin diff --git a/sysutils/deltup/files/patch-Makefile b/sysutils/deltup/files/patch-Makefile index 1f2ce73ec5c5..4c65a1ce768e 100644 --- a/sysutils/deltup/files/patch-Makefile +++ b/sysutils/deltup/files/patch-Makefile @@ -1,17 +1,13 @@ --- Makefile.orig 2005-05-21 04:23:34.000000000 +0400 +++ Makefile 2013-03-16 09:57:42.000000000 +0400 -@@ -1,21 +1,21 @@ - DESTDIR= --PREFIX=/usr -+PREFIX=%%PREFIX%% - BINDIR=$(PREFIX)/bin +@@ -4,13 +4,13 @@ --CC = g++ -+CC ?= g++ + CC = g++ -objfiles=bpatch.o bzip2.o file.o system.o tmpstore.o deltup.o +-libs=-lstdc++ -lz -lbz2 -lssl +objfiles=bpatch.o bzip2.o gzip.o file.o system.o tmpstore.o deltup.o - libs=-lstdc++ -lz -lbz2 -lssl ++libs=-lz -lbz2 -lcrypto #edelta: edelta.cpp deltup # gcc edelta.cpp ${CXXFLAGS} -o edelta @@ -21,9 +17,3 @@ all: deltup - depend: -- gcc -MM *.cpp > .depend -+ ${CC} -MM *.cpp > .depend - - deltup: $(objfiles) - ${CC} $(objfiles) ${CXXFLAGS} -o deltup $(libs) |