diff options
| author | tijl <tijl@FreeBSD.org> | 2014-08-26 22:06:08 +0800 |
|---|---|---|
| committer | tijl <tijl@FreeBSD.org> | 2014-08-26 22:06:08 +0800 |
| commit | f8357b5cbaa160ccdf9943cac099f5e092c591da (patch) | |
| tree | d0c8617b772b8f0a175d436d938b8d844590b41f /multimedia/ffmpeg2theora | |
| parent | 89a7d6ecbdde724b92ca6650493f56cf68855f35 (diff) | |
| download | freebsd-ports-gnome-f8357b5cbaa160ccdf9943cac099f5e092c591da.tar.gz freebsd-ports-gnome-f8357b5cbaa160ccdf9943cac099f5e092c591da.tar.zst freebsd-ports-gnome-f8357b5cbaa160ccdf9943cac099f5e092c591da.zip | |
- Fix missing library problems when the linker enforces explicit linking
PR: 192062
Exp-run by: antoine
Approved by: portmgr (antoine)
Diffstat (limited to 'multimedia/ffmpeg2theora')
| -rw-r--r-- | multimedia/ffmpeg2theora/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg2theora/files/patch-SConstruct | 10 |
2 files changed, 11 insertions, 3 deletions
diff --git a/multimedia/ffmpeg2theora/Makefile b/multimedia/ffmpeg2theora/Makefile index 6ccd92ca7857..847e0afeb1c0 100644 --- a/multimedia/ffmpeg2theora/Makefile +++ b/multimedia/ffmpeg2theora/Makefile @@ -16,10 +16,10 @@ LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \ libtheora.so:${PORTSDIR}/multimedia/libtheora USES= iconv pkgconfig scons tar:bzip2 -MAKE_ENV= APPEND_CCFLAGS="${CPPFLAGS}" APPEND_LINKFLAGS="${LDFLAGS}" CCFLAGS="${CPPFLAGS}" +MAKE_ENV= APPEND_CCFLAGS="${CPPFLAGS}" APPEND_LINKFLAGS="${LDFLAGS}" CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +LDFLAGS+= -L${LOCALBASE}/lib PLIST_FILES= bin/ffmpeg2theora man/man1/ffmpeg2theora.1.gz diff --git a/multimedia/ffmpeg2theora/files/patch-SConstruct b/multimedia/ffmpeg2theora/files/patch-SConstruct index 9d37ce376f6b..3ea68362898d 100644 --- a/multimedia/ffmpeg2theora/files/patch-SConstruct +++ b/multimedia/ffmpeg2theora/files/patch-SConstruct @@ -5,7 +5,7 @@ BoolVariable('crossmingw', 'Set to 1 for crosscompile with mingw', 0) ) -env = Environment(options = opts) -+env = Environment(options = opts, CC = Split(os.environ['CC']), CCFLAGS = Split(os.environ['CCFLAGS'])) ++env = Environment(options = opts, CC = Split(os.environ['CC'])) Help(opts.GenerateHelpText(env)) pkg_flags="--cflags --libs" @@ -17,3 +17,11 @@ "libavutil", ] if os.path.exists("./ffmpeg"): +@@ -203,6 +202,7 @@ + if conf.CheckLib('iconv'): + env.Append(LIBS=['iconv']) + ++ env.Append(LIBS=['m']) + if env['crossmingw']: + env.Append(CCFLAGS=['-Wl,-subsystem,windows']) + env.Append(LIBS=['m']) |