From: Christopher Larson <kergoth@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH v2 1/8] zlib: obey LDFLAGS for tests
Date: Tue, 16 Sep 2014 18:16:55 -0700 [thread overview]
Message-ID: <1410916622-26204-2-git-send-email-kergoth@gmail.com> (raw)
In-Reply-To: <1410916622-26204-1-git-send-email-kergoth@gmail.com>
In-Reply-To: <cover.1409764769.git.chris_larson@mentor.com>
Signed-off-by: Christopher Larson <kergoth@gmail.com>
---
.../zlib/zlib-1.2.8/ldflags-tests.patch | 45 ++++++++++++++++++++++
meta/recipes-core/zlib/zlib_1.2.8.bb | 1 +
2 files changed, 46 insertions(+)
create mode 100644 meta/recipes-core/zlib/zlib-1.2.8/ldflags-tests.patch
diff --git a/meta/recipes-core/zlib/zlib-1.2.8/ldflags-tests.patch b/meta/recipes-core/zlib/zlib-1.2.8/ldflags-tests.patch
new file mode 100644
index 0000000..650794f
--- /dev/null
+++ b/meta/recipes-core/zlib/zlib-1.2.8/ldflags-tests.patch
@@ -0,0 +1,45 @@
+Obey LDFLAGS for tests
+
+Signed-off-by: Christopher Larson <chris_larson@mentor.com>
+Upstream-status: Pending
+
+--- zlib-1.2.8.orig/Makefile.in
++++ zlib-1.2.8/Makefile.in
+@@ -26,7 +26,7 @@ CFLAGS=-O
+
+ SFLAGS=-O
+ LDFLAGS=
+-TEST_LDFLAGS=-L. libz.a
++TEST_LDFLAGS=-L. $(LDFLAGS)
+ LDSHARED=$(CC)
+ CPP=$(CC) -E
+
+@@ -176,22 +176,22 @@ placebo $(SHAREDLIBV): $(PIC_OBJS) libz.
+ -@rmdir objs
+
+ example$(EXE): example.o $(STATICLIB)
+- $(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS)
++ $(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS) $(STATICLIB)
+
+ minigzip$(EXE): minigzip.o $(STATICLIB)
+- $(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS)
++ $(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS) $(STATICLIB)
+
+ examplesh$(EXE): example.o $(SHAREDLIBV)
+- $(CC) $(CFLAGS) -o $@ example.o -L. $(SHAREDLIBV)
++ $(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS) $(SHAREDLIBV)
+
+ minigzipsh$(EXE): minigzip.o $(SHAREDLIBV)
+- $(CC) $(CFLAGS) -o $@ minigzip.o -L. $(SHAREDLIBV)
++ $(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS) $(SHAREDLIBV)
+
+ example64$(EXE): example64.o $(STATICLIB)
+- $(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS)
++ $(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS) $(STATICLIB)
+
+ minigzip64$(EXE): minigzip64.o $(STATICLIB)
+- $(CC) $(CFLAGS) -o $@ minigzip64.o $(TEST_LDFLAGS)
++ $(CC) $(CFLAGS) -o $@ minigzip64.o $(TEST_LDFLAGS) $(STATICLIB)
+
+ install-libs: $(LIBS)
+ -@if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi
diff --git a/meta/recipes-core/zlib/zlib_1.2.8.bb b/meta/recipes-core/zlib/zlib_1.2.8.bb
index bdfa045..ca0ba3f 100644
--- a/meta/recipes-core/zlib/zlib_1.2.8.bb
+++ b/meta/recipes-core/zlib/zlib_1.2.8.bb
@@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://zlib.h;beginline=4;endline=23;md5=fde612df1e5933c428b
SRC_URI = "http://www.zlib.net/${BPN}-${PV}.tar.xz \
file://remove.ldconfig.call.patch \
file://Makefile-runtests.patch \
+ file://ldflags-tests.patch \
file://run-ptest \
"
--
1.8.3.4
next prev parent reply other threads:[~2014-09-17 1:17 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-03 17:27 [PATCH 0/8] Various fixes to obey LDFLAGS Christopher Larson
2014-09-03 17:27 ` [PATCH 1/8] zlib: obey LDFLAGS for tests Christopher Larson
2014-09-03 17:27 ` [PATCH 2/8] gdbm-1.8.3: obey LDFLAGS Christopher Larson
2014-09-03 17:27 ` [PATCH 3/8] ossp-uuid: " Christopher Larson
2014-09-04 10:39 ` Burton, Ross
2014-09-03 17:27 ` [PATCH 4/8] setserial: " Christopher Larson
2014-09-04 10:39 ` Burton, Ross
2014-09-03 17:27 ` [PATCH 5/8] hostap-utils: " Christopher Larson
2014-09-04 10:48 ` Burton, Ross
2014-09-03 17:27 ` [PATCH 6/8] blktrace: obey LDFLAGS for btrecord Christopher Larson
2014-09-04 10:48 ` Burton, Ross
2014-09-03 17:27 ` [PATCH 7/8] irda-utils: obey LDFLAGS Christopher Larson
2014-09-04 10:48 ` Burton, Ross
2014-09-03 17:27 ` [PATCH 8/8] python: " Christopher Larson
2014-09-17 1:16 ` [PATCHv2 0/8] Various fixes to " Christopher Larson
2014-09-17 1:16 ` Christopher Larson [this message]
2014-09-17 1:16 ` [PATCH v2 2/8] gdbm-1.8.3: " Christopher Larson
2014-09-17 1:16 ` [PATCH v2 3/8] ossp-uuid: " Christopher Larson
2014-09-17 1:16 ` [PATCH v2 4/8] setserial: " Christopher Larson
2014-09-17 1:16 ` [PATCH v2 5/8] hostap-utils: " Christopher Larson
2014-09-17 1:17 ` [PATCH v2 6/8] blktrace: obey LDFLAGS for btrecord Christopher Larson
2014-09-18 7:26 ` Khem Raj
2014-09-18 20:51 ` Christopher Larson
2014-09-19 4:42 ` Khem Raj
2014-09-17 1:17 ` [PATCH v2 7/8] irda-utils: obey LDFLAGS Christopher Larson
2014-09-17 1:17 ` [PATCH v2 8/8] python: " Christopher Larson
2014-09-18 7:30 ` [PATCH 0/8] Various fixes to " Khem Raj
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1410916622-26204-2-git-send-email-kergoth@gmail.com \
--to=kergoth@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox