summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2016-12-12 03:38:33 -0800
committerMichael Forney <mforney@mforney.org>2016-12-13 23:10:30 -0800
commit36835fdbd958afcfb18857c05390cd712796ffb0 (patch)
tree98262fa0a23152219f60b5e64d2e144cce037109 /pkg
parent293f5a93b77d92fd65db7f3d0df654f102e46cfb (diff)
Declare some missing dependencies
Diffstat (limited to 'pkg')
-rw-r--r--pkg/curl/gen.rc6
-rw-r--r--pkg/efivar/gen.rc4
-rw-r--r--pkg/ffmpeg/gen.rc6
-rw-r--r--pkg/libevent/gen.rc3
-rw-r--r--pkg/mpv/gen.rc2
-rw-r--r--pkg/pixman/gen.rc6
-rw-r--r--pkg/transmission/gen.rc2
7 files changed, 17 insertions, 12 deletions
diff --git a/pkg/curl/gen.rc b/pkg/curl/gen.rc
index f7174efe..2300073a 100644
--- a/pkg/curl/gen.rc
+++ b/pkg/curl/gen.rc
@@ -14,7 +14,7 @@ for(hdr in $hdrs) build '$outdir'/$hdr copy '$srcdir'/$hdr
build '$outdir'/include/curl/curlbuild.h copy '$srcdir'/include/curl/curlbuild.h.dist
phony headers '$outdir'/^($hdrs include/curl/curlbuild.h)
-phony deps pkg/^(libressl zlib)^/headers
+phony deps '$dir'/headers pkg/^(libressl zlib)^/headers
# src/lib/Makefile.inc:/^CSOURCES
lib libcurl.a -d '$dir'/deps lib/^(\
@@ -52,10 +52,10 @@ lib libcurl.a -d '$dir'/deps lib/^(\
zlib/libz.a\
)
-build '$outdir'/tool_hugehelp.c.o cc '$dir'/tool_hugehelp.c '||' '$srcdir'/src/tool_hugehelp.h
+build '$outdir'/tool_hugehelp.c.o cc '$dir'/tool_hugehelp.c '||' '$dir'/deps '$srcdir'/src/tool_hugehelp.h
# src/src/Makefile.inc:/^CURL_CFILES
-exe curl -d '$outdir'/include/curl/curlbuild.h\
+exe curl -d '$dir'/deps\
src/^(\
slist_wc.c\
tool_binmode.c\
diff --git a/pkg/efivar/gen.rc b/pkg/efivar/gen.rc
index 4dc6f8fd..48295319 100644
--- a/pkg/efivar/gen.rc
+++ b/pkg/efivar/gen.rc
@@ -26,7 +26,9 @@ for(hdr in $hdrs) {
}
phony headers '$outdir'/include/^($hdrs efivar-guids.h)
-lib libefiboot.a src/^(crc32.c creator.c disk.c gpt.c linux.c loadopt.c)
+lib libefiboot.a -d '$outdir'/include/efivar-guids.h src/^(\
+ crc32.c creator.c disk.c gpt.c linux.c loadopt.c\
+)
lib libefivar.a -d '$outdir'/include/efivar-guids.h src/^(\
dp.c dp-acpi.c dp-hw.c dp-media.c dp-message.c\
efivarfs.c export.c guid.c guids.S.o\
diff --git a/pkg/ffmpeg/gen.rc b/pkg/ffmpeg/gen.rc
index 767e532a..13dd3623 100644
--- a/pkg/ffmpeg/gen.rc
+++ b/pkg/ffmpeg/gen.rc
@@ -243,12 +243,12 @@ libs=(\
libswresample.a.d libswscale.a.d\
)
-cc cmdutils.c
+cc cmdutils.c '||' '$dir'/deps
-exe ffprobe ffprobe.c cmdutils.c.o $libs
+exe ffprobe -d '$dir'/deps ffprobe.c cmdutils.c.o $libs
file bin/ffprobe '$outdir'/ffprobe 755
-exe ffmpeg ffmpeg.c ffmpeg_opt.c ffmpeg_filter.c cmdutils.c.o $libs
+exe ffmpeg -d '$dir'/deps ffmpeg.c ffmpeg_opt.c ffmpeg_filter.c cmdutils.c.o $libs
file bin/ffmpeg '$outdir'/ffmpeg 755
fetch git
diff --git a/pkg/libevent/gen.rc b/pkg/libevent/gen.rc
index 1a9fb3c3..90c89e44 100644
--- a/pkg/libevent/gen.rc
+++ b/pkg/libevent/gen.rc
@@ -9,8 +9,9 @@ build '$outdir'/include/event2/event-config.h\
with expr '-f $srcdir/make-event-config.sed'
phony headers '$outdir'/include/event2/event-config.h
+phony deps '$dir'/headers '$builddir'/pkg/openbsd/fetch.stamp
-lib libevent.a -d '$dir'/headers\
+lib libevent.a -d '$dir'/deps\
event.c evthread.c buffer.c \
bufferevent.c bufferevent_sock.c bufferevent_filter.c \
bufferevent_pair.c listener.c bufferevent_ratelim.c \
diff --git a/pkg/mpv/gen.rc b/pkg/mpv/gen.rc
index a95e9da9..751a0fad 100644
--- a/pkg/mpv/gen.rc
+++ b/pkg/mpv/gen.rc
@@ -59,6 +59,7 @@ if(grep -qF 'HAVE_ALSA 1' config.h) {
if(grep -qF 'HAVE_DRM 1' config.h) {
cflags=($cflags '-isystem pkg/libdrm/'^(src src/include/drm))
libs=($libs libdrm/libdrm.a)
+ deps=($deps '$builddir'/pkg/libdrm/fetch.stamp)
}
if(grep -qF 'HAVE_LIBASS 1' config.h) {
cflags=($cflags -isystem '$builddir'/pkg/libass/include)
@@ -68,6 +69,7 @@ if(grep -qF 'HAVE_LIBASS 1' config.h) {
if(grep -qF 'HAVE_LUA 1' config.h) {
cflags=($cflags -isystem pkg/lua/src/src)
libs=($libs lua/liblua.a)
+ deps=($deps '$builddir'/pkg/lua/fetch.stamp)
}
cflags $cflags
diff --git a/pkg/pixman/gen.rc b/pkg/pixman/gen.rc
index 408007a7..41e6d671 100644
--- a/pkg/pixman/gen.rc
+++ b/pkg/pixman/gen.rc
@@ -15,9 +15,9 @@ phony headers '$outdir'/include/^(pixman.h pixman-version.h)
# processor-specific features
cflags -D 'USE_SSE2=1' -D 'USE_SSSE3=1' -D 'USE_X86_MMX=1'
-cc pixman/pixman-mmx.c '||' $deps ; with cflags '$cflags -mmmx -Winline'
-cc pixman/pixman-sse2.c '||' $deps ; with cflags '$cflags -msse2 -Winline'
-cc pixman/pixman-ssse3.c '||' $deps ; with cflags '$cflags -mssse3 -Winline'
+cc pixman/pixman-mmx.c '||' '$dir'/headers ; with cflags '$cflags -mmmx -Winline'
+cc pixman/pixman-sse2.c '||' '$dir'/headers ; with cflags '$cflags -msse2 -Winline'
+cc pixman/pixman-ssse3.c '||' '$dir'/headers ; with cflags '$cflags -mssse3 -Winline'
cpuobjs=(pixman-mmx.c pixman-sse2.c pixman-ssse3.c)^.o
lib libpixman.a -d '$dir'/headers pixman/^(\
diff --git a/pkg/transmission/gen.rc b/pkg/transmission/gen.rc
index b9d2134c..196394ee 100644
--- a/pkg/transmission/gen.rc
+++ b/pkg/transmission/gen.rc
@@ -144,7 +144,7 @@ file bin/transmission-remote '$outdir'/transmission-remote 755
file share/man/man1/transmission-remote.1 '$srcdir'/daemon/transmission-remote.1 644
for(tool in create edit show) {
- exe transmission-$tool utils/$tool.c libtransmission.a.d
+ exe transmission-$tool -d '$dir'/deps utils/$tool.c libtransmission.a.d
file bin/transmission-$tool '$outdir'/transmission-$tool 755
file share/man/man1/transmission-$tool.1 '$srcdir'/utils/transmission-$tool.1 644
}