diff options
-rw-r--r-- | meta-oe/recipes-support/daemonize/daemonize_git.bb | 6 | ||||
-rw-r--r-- | meta-oe/recipes-support/daemonize/files/fix-ldflags-for-gnuhash.patch | 23 |
2 files changed, 3 insertions, 26 deletions
diff --git a/meta-oe/recipes-support/daemonize/daemonize_git.bb b/meta-oe/recipes-support/daemonize/daemonize_git.bb index 4790883a7d..1e49eefcc0 100644 --- a/meta-oe/recipes-support/daemonize/daemonize_git.bb +++ b/meta-oe/recipes-support/daemonize/daemonize_git.bb | |||
@@ -2,13 +2,13 @@ SUMMARY = "A tool to run a command as a daemon" | |||
2 | HOMEPAGE = "http://software.clapper.org/daemonize/" | 2 | HOMEPAGE = "http://software.clapper.org/daemonize/" |
3 | LICENSE = "BSD" | 3 | LICENSE = "BSD" |
4 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=3cf9084faa88bc8554a9139d8d7dd35f" | 4 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=3cf9084faa88bc8554a9139d8d7dd35f" |
5 | PV = "1.7.7+git${SRCPV}" | 5 | PV = "1.7.8" |
6 | 6 | ||
7 | inherit autotools | 7 | inherit autotools |
8 | 8 | ||
9 | SRCREV = "6b10308b13c13e7b911e75e27bf7e65c30d58799" | 9 | SRCREV = "18869a797dab12bf1c917ba3b4782fef484c407c" |
10 | SRC_URI = "git://github.com/bmc/daemonize.git \ | 10 | SRC_URI = "git://github.com/bmc/daemonize.git \ |
11 | file://fix-ldflags-for-gnuhash.patch" | 11 | " |
12 | 12 | ||
13 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |
14 | 14 | ||
diff --git a/meta-oe/recipes-support/daemonize/files/fix-ldflags-for-gnuhash.patch b/meta-oe/recipes-support/daemonize/files/fix-ldflags-for-gnuhash.patch deleted file mode 100644 index 4fa2ee1b3b..0000000000 --- a/meta-oe/recipes-support/daemonize/files/fix-ldflags-for-gnuhash.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | Add the LDFLAGS to the final link to avoid errors with missing GNU_HASH | ||
2 | |||
3 | Upstream-Status: Submitted [https://github.com/bmc/daemonize/pull/22] | ||
4 | |||
5 | Signed-off-by: Derek Straka <derek@asterius.io> | ||
6 | |||
7 | diff --git a/Makefile.in b/Makefile.in | ||
8 | index 8a4d078..40d3dee 100644 | ||
9 | --- a/Makefile.in | ||
10 | +++ b/Makefile.in | ||
11 | @@ -24,10 +24,10 @@ LDFLAGS = @LDFLAGS@ | ||
12 | all: daemonize | ||
13 | |||
14 | daemonize: daemonize.o getopt.o $(MISSING_OBJECTS) | ||
15 | - $(CC) $(CFLAGS) -o $@ $^ | ||
16 | + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ | ||
17 | |||
18 | testdaemon: testdaemon.o | ||
19 | - $(CC) $(CFLAGS) -o $@ $^ | ||
20 | + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ | ||
21 | |||
22 | psman: daemonize.ps | ||
23 | |||