* [PATCH 0/8] Various fixes to obey LDFLAGS
@ 2014-09-03 17:27 Christopher Larson
2014-09-03 17:27 ` [PATCH 1/8] zlib: obey LDFLAGS for tests Christopher Larson
` (17 more replies)
0 siblings, 18 replies; 27+ messages in thread
From: Christopher Larson @ 2014-09-03 17:27 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
This patch series fixes 8 recipes to obey LDFLAGS. These issues are easy to
miss, now that the internal toolchain defaults to passing the correct
GNU_HASH, so GNU_HASH warnings when LDFLAGS isn't obeyed are only seen when
using an external toolchain. These were kept in meta-sourcery or meta-mentor,
but given these are general correctness fixes, regardless of the lack of
warnings for most users, I think they're appropriate for upstream inclusion.
The following changes since commit e72aac2ae9e5fce1715fa04b7e94034fd06892d9:
alsa-lib: libasound should runtime depends on alsa-conf (2014-09-03 11:30:11 +0100)
are available in the git repository at:
git@github.com:kergoth/openembedded-core ldflags-fixes
https://github.com/kergoth/openembedded-core ldflags-fixes
for you to fetch changes up to 2cddd349eb9cafbbaf5257fb61beb9dc249df85c:
python: obey LDFLAGS (2014-09-03 10:18:37 -0700)
----------------------------------------------------------------
Christopher Larson (8):
zlib: obey LDFLAGS for tests
gdbm-1.8.3: obey LDFLAGS
ossp-uuid: obey LDFLAGS
setserial: obey LDFLAGS
hostap-utils: obey LDFLAGS
blktrace: obey LDFLAGS for btrecord
irda-utils: obey LDFLAGS
python: obey LDFLAGS
.../hostap/hostap-utils-0.4.7/ldflags.patch | 27 ++++++++
meta/recipes-bsp/hostap/hostap-utils_0.4.7.bb | 1 +
meta/recipes-bsp/setserial/setserial/ldflags.patch | 23 +++++++
meta/recipes-bsp/setserial/setserial_2.17.bb | 1 +
.../irda-utils/irda-utils-0.9.18/ldflags.patch | 79 ++++++++++++++++++++++
.../irda-utils/irda-utils_0.9.18.bb | 18 +++--
.../zlib/zlib-1.2.8/ldflags-tests.patch | 45 ++++++++++++
meta/recipes-core/zlib/zlib_1.2.8.bb | 1 +
.../ossp-uuid/ossp-uuid/ldflags.patch | 23 +++++++
meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb | 1 +
meta/recipes-devtools/python/python_2.7.3.bb | 3 +-
.../recipes-kernel/blktrace/blktrace/ldflags.patch | 8 ++-
meta/recipes-support/gdbm/gdbm-1.8.3/ldflags.patch | 22 ++++++
meta/recipes-support/gdbm/gdbm_1.8.3.bb | 3 +-
14 files changed, 245 insertions(+), 10 deletions(-)
create mode 100644 meta/recipes-bsp/hostap/hostap-utils-0.4.7/ldflags.patch
create mode 100644 meta/recipes-bsp/setserial/setserial/ldflags.patch
create mode 100644 meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch
create mode 100644 meta/recipes-core/zlib/zlib-1.2.8/ldflags-tests.patch
create mode 100644 meta/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch
create mode 100644 meta/recipes-support/gdbm/gdbm-1.8.3/ldflags.patch
--
1.8.3.4
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH 1/8] zlib: obey LDFLAGS for tests
2014-09-03 17:27 [PATCH 0/8] Various fixes to obey LDFLAGS Christopher Larson
@ 2014-09-03 17:27 ` Christopher Larson
2014-09-03 17:27 ` [PATCH 2/8] gdbm-1.8.3: obey LDFLAGS Christopher Larson
` (16 subsequent siblings)
17 siblings, 0 replies; 27+ messages in thread
From: Christopher Larson @ 2014-09-03 17:27 UTC (permalink / raw)
To: openembedded-core
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
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 2/8] gdbm-1.8.3: obey LDFLAGS
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 ` Christopher Larson
2014-09-03 17:27 ` [PATCH 3/8] ossp-uuid: " Christopher Larson
` (15 subsequent siblings)
17 siblings, 0 replies; 27+ messages in thread
From: Christopher Larson @ 2014-09-03 17:27 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
meta/recipes-support/gdbm/gdbm-1.8.3/ldflags.patch | 22 ++++++++++++++++++++++
meta/recipes-support/gdbm/gdbm_1.8.3.bb | 3 ++-
2 files changed, 24 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-support/gdbm/gdbm-1.8.3/ldflags.patch
diff --git a/meta/recipes-support/gdbm/gdbm-1.8.3/ldflags.patch b/meta/recipes-support/gdbm/gdbm-1.8.3/ldflags.patch
new file mode 100644
index 0000000..2fafbc4
--- /dev/null
+++ b/meta/recipes-support/gdbm/gdbm-1.8.3/ldflags.patch
@@ -0,0 +1,22 @@
+Obey LDFLAGS
+
+Signed-off-by: Christopher Larson <chris_larson@mentor.com>
+Upstream-status: Inappropriate [old version]
+
+--- gdbm-1.8.3.orig/Makefile.in
++++ gdbm-1.8.3/Makefile.in
+@@ -156,12 +156,12 @@ install-compat:
+
+ libgdbm.la: $(LOBJS) gdbm.h
+ rm -f libgdbm.la
+- $(LIBTOOL) --mode=link $(CC) -o libgdbm.la -rpath $(libdir) \
++ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o libgdbm.la -rpath $(libdir) \
+ -version-info $(SHLIB_VER) $(LOBJS)
+
+ libgdbm_compat.la: $(C_LOBJS) gdbm.h
+ rm -f libgdbm_compat.la
+- $(LIBTOOL) --mode=link $(CC) -o libgdbm_compat.la -rpath $(libdir) \
++ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o libgdbm_compat.la -rpath $(libdir) \
+ -version-info $(SHLIB_VER) $(C_LOBJS)
+
+ gdbm.h: gdbm.proto gdbmerrno.h gdbm.proto2
diff --git a/meta/recipes-support/gdbm/gdbm_1.8.3.bb b/meta/recipes-support/gdbm/gdbm_1.8.3.bb
index aecf47a..2331d1d 100644
--- a/meta/recipes-support/gdbm/gdbm_1.8.3.bb
+++ b/meta/recipes-support/gdbm/gdbm_1.8.3.bb
@@ -8,7 +8,8 @@ PR = "r4"
SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \
file://makefile.patch \
- file://libtool-mode.patch"
+ file://libtool-mode.patch \
+ file://ldflags.patch"
SRC_URI[md5sum] = "1d1b1d5c0245b1c00aff92da751e9aa1"
SRC_URI[sha256sum] = "cc340338a2e28b40058ab9eb5354a21d53f88a1582ea21ba0bb185c37a281dc9"
--
1.8.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 3/8] ossp-uuid: obey LDFLAGS
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 ` Christopher Larson
2014-09-04 10:39 ` Burton, Ross
2014-09-03 17:27 ` [PATCH 4/8] setserial: " Christopher Larson
` (14 subsequent siblings)
17 siblings, 1 reply; 27+ messages in thread
From: Christopher Larson @ 2014-09-03 17:27 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
.../ossp-uuid/ossp-uuid/ldflags.patch | 23 ++++++++++++++++++++++
meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb | 1 +
2 files changed, 24 insertions(+)
create mode 100644 meta/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch
new file mode 100644
index 0000000..a4cb455
--- /dev/null
+++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch
@@ -0,0 +1,23 @@
+Index: uuid-1.6.2/Makefile.in
+===================================================================
+--- uuid-1.6.2.orig/Makefile.in
++++ uuid-1.6.2/Makefile.in
+@@ -113,15 +113,15 @@ all: $(TARGETS)
+ @$(LIBTOOL) --mode=compile $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+ $(LIB_NAME): $(LIB_OBJS)
+- @$(LIBTOOL) --mode=link $(CC) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) \
++ @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) \
+ -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h`
+
+ $(DCE_NAME): $(DCE_OBJS)
+- @$(LIBTOOL) --mode=link $(CC) -o $(DCE_NAME) $(DCE_OBJS) -rpath $(libdir) \
++ @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(DCE_NAME) $(DCE_OBJS) -rpath $(libdir) \
+ -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h`
+
+ $(CXX_NAME): $(CXX_OBJS)
+- @$(LIBTOOL) --mode=link $(CXX) -o $(CXX_NAME) $(CXX_OBJS) -rpath $(libdir) \
++ @$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $(CXX_NAME) $(CXX_OBJS) -rpath $(libdir) \
+ -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h`
+
+ $(PRG_NAME): $(PRG_OBJS) $(LIB_NAME)
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb b/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb
index f524854..160990c 100644
--- a/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb
+++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb
@@ -25,6 +25,7 @@ SRC_URI = "http://gnome-build-stage-1.googlecode.com/files/uuid-1.6.2.tar.gz \
file://uuid-libtool.patch \
file://uuid-nostrip.patch \
file://install-pc.patch \
+ file://ldflags.patch \
"
SRC_URI[md5sum] = "5db0d43a9022a6ebbbc25337ae28942f"
SRC_URI[sha256sum] = "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0"
--
1.8.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 4/8] setserial: obey LDFLAGS
2014-09-03 17:27 [PATCH 0/8] Various fixes to obey LDFLAGS Christopher Larson
` (2 preceding siblings ...)
2014-09-03 17:27 ` [PATCH 3/8] ossp-uuid: " Christopher Larson
@ 2014-09-03 17:27 ` Christopher Larson
2014-09-04 10:39 ` Burton, Ross
2014-09-03 17:27 ` [PATCH 5/8] hostap-utils: " Christopher Larson
` (13 subsequent siblings)
17 siblings, 1 reply; 27+ messages in thread
From: Christopher Larson @ 2014-09-03 17:27 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
meta/recipes-bsp/setserial/setserial/ldflags.patch | 23 ++++++++++++++++++++++
meta/recipes-bsp/setserial/setserial_2.17.bb | 1 +
2 files changed, 24 insertions(+)
create mode 100644 meta/recipes-bsp/setserial/setserial/ldflags.patch
diff --git a/meta/recipes-bsp/setserial/setserial/ldflags.patch b/meta/recipes-bsp/setserial/setserial/ldflags.patch
new file mode 100644
index 0000000..33f23b8
--- /dev/null
+++ b/meta/recipes-bsp/setserial/setserial/ldflags.patch
@@ -0,0 +1,23 @@
+---
+ Makefile.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- setserial-2.17.orig/Makefile.in
++++ setserial-2.17/Makefile.in
+@@ -13,6 +13,7 @@ STRIP = @STRIP@
+ CC = @CC@
+ RM = rm -f
+ CFLAGS = @CFLAGS@
++LDFLAGS = @LDFLAGS@
+ DEFS = @DEFS@
+ INCS = -I.
+ TAR = tar
+@@ -20,7 +21,7 @@ TAR = tar
+ all: setserial setserial.cat
+
+ setserial: setserial.c
+- $(CC) $(CFLAGS) $(DEFS) $(INCS) setserial.c -o setserial
++ $(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) $(INCS) setserial.c -o setserial
+
+ setserial.cat: setserial.8
+ nroff -man setserial.8 > setserial.cat
diff --git a/meta/recipes-bsp/setserial/setserial_2.17.bb b/meta/recipes-bsp/setserial/setserial_2.17.bb
index f1e8cd3..8dbddd7 100644
--- a/meta/recipes-bsp/setserial/setserial_2.17.bb
+++ b/meta/recipes-bsp/setserial/setserial_2.17.bb
@@ -14,6 +14,7 @@ inherit autotools-brokensep
SRC_URI = "${SOURCEFORGE_MIRROR}/setserial/${BPN}-${PV}.tar.gz \
file://add_stdlib.patch \
+ file://ldflags.patch \
"
SRC_URI[md5sum] = "c4867d72c41564318e0107745eb7a0f2"
--
1.8.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 5/8] hostap-utils: obey LDFLAGS
2014-09-03 17:27 [PATCH 0/8] Various fixes to obey LDFLAGS Christopher Larson
` (3 preceding siblings ...)
2014-09-03 17:27 ` [PATCH 4/8] setserial: " Christopher Larson
@ 2014-09-03 17:27 ` Christopher Larson
2014-09-04 10:48 ` Burton, Ross
2014-09-03 17:27 ` [PATCH 6/8] blktrace: obey LDFLAGS for btrecord Christopher Larson
` (12 subsequent siblings)
17 siblings, 1 reply; 27+ messages in thread
From: Christopher Larson @ 2014-09-03 17:27 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
.../hostap/hostap-utils-0.4.7/ldflags.patch | 27 ++++++++++++++++++++++
meta/recipes-bsp/hostap/hostap-utils_0.4.7.bb | 1 +
2 files changed, 28 insertions(+)
create mode 100644 meta/recipes-bsp/hostap/hostap-utils-0.4.7/ldflags.patch
diff --git a/meta/recipes-bsp/hostap/hostap-utils-0.4.7/ldflags.patch b/meta/recipes-bsp/hostap/hostap-utils-0.4.7/ldflags.patch
new file mode 100644
index 0000000..fe60303
--- /dev/null
+++ b/meta/recipes-bsp/hostap/hostap-utils-0.4.7/ldflags.patch
@@ -0,0 +1,27 @@
+---
+ Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- hostap-utils-0.4.7.orig/Makefile
++++ hostap-utils-0.4.7/Makefile
+@@ -14,17 +14,17 @@ prism2_srec.o: prism2_srec.c util.h
+ hostap_crypt_conf: hostap_crypt_conf.c
+
+ hostap_diag: hostap_diag.o util.o
+- $(CC) -o hostap_diag $(CFLAGS) hostap_diag.o util.o
++ $(CC) -o hostap_diag $(CFLAGS) $(LDFLAGS) hostap_diag.o util.o
+
+ hostap_diag.o: hostap_diag.c util.h
+
+ util.o: util.c util.h
+
+ hostap_io_debug: hostap_io_debug.c
+- $(CC) -o hostap_io_debug $(CFLAGS) hostap_io_debug.c
++ $(CC) -o hostap_io_debug $(CFLAGS) $(LDFLAGS) hostap_io_debug.c
+
+ hostap_rid: hostap_rid.o util.o
+- $(CC) -o hostap_rid $(CFLAGS) hostap_rid.o util.o
++ $(CC) -o hostap_rid $(CFLAGS) $(LDFLAGS) hostap_rid.o util.o
+
+ hostap_rid.o: hostap_rid.c util.h
+
diff --git a/meta/recipes-bsp/hostap/hostap-utils_0.4.7.bb b/meta/recipes-bsp/hostap/hostap-utils_0.4.7.bb
index 7b224a8..be5481f 100644
--- a/meta/recipes-bsp/hostap/hostap-utils_0.4.7.bb
+++ b/meta/recipes-bsp/hostap/hostap-utils_0.4.7.bb
@@ -1,4 +1,5 @@
require hostap-utils.inc
+SRC_URI += "file://ldflags.patch"
SRC_URI[md5sum] = "afe041581b8f01666e353bec20917c85"
SRC_URI[sha256sum] = "c6f598d8e356c1620fa009eca0a700bf1105e16817eefd77d891994261009355"
--
1.8.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 6/8] blktrace: obey LDFLAGS for btrecord
2014-09-03 17:27 [PATCH 0/8] Various fixes to obey LDFLAGS Christopher Larson
` (4 preceding siblings ...)
2014-09-03 17:27 ` [PATCH 5/8] hostap-utils: " Christopher Larson
@ 2014-09-03 17:27 ` Christopher Larson
2014-09-04 10:48 ` Burton, Ross
2014-09-03 17:27 ` [PATCH 7/8] irda-utils: obey LDFLAGS Christopher Larson
` (11 subsequent siblings)
17 siblings, 1 reply; 27+ messages in thread
From: Christopher Larson @ 2014-09-03 17:27 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
meta/recipes-kernel/blktrace/blktrace/ldflags.patch | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-kernel/blktrace/blktrace/ldflags.patch b/meta/recipes-kernel/blktrace/blktrace/ldflags.patch
index b9c7c20..3564e51 100644
--- a/meta/recipes-kernel/blktrace/blktrace/ldflags.patch
+++ b/meta/recipes-kernel/blktrace/blktrace/ldflags.patch
@@ -59,8 +59,12 @@ Signed-off-by: Fahad Usman <fahad_usman@mentor.com>
INCS = -I. -I.. -I../btt
OCFLAGS = -UCOUNT_IOS -UDEBUG -DNDEBUG
XCFLAGS = -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-@@ -35,7 +36,7 @@ btrecord: btrecord.o
- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^)
+@@ -32,10 +33,10 @@ clean: docsclean
+ $(CC) $(CFLAGS) -c -o $*.o $<
+
+ btrecord: btrecord.o
+- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^)
++ $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LDFLAGS)
btreplay: btreplay.o
- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
--
1.8.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 7/8] irda-utils: obey LDFLAGS
2014-09-03 17:27 [PATCH 0/8] Various fixes to obey LDFLAGS Christopher Larson
` (5 preceding siblings ...)
2014-09-03 17:27 ` [PATCH 6/8] blktrace: obey LDFLAGS for btrecord Christopher Larson
@ 2014-09-03 17:27 ` Christopher Larson
2014-09-04 10:48 ` Burton, Ross
2014-09-03 17:27 ` [PATCH 8/8] python: " Christopher Larson
` (10 subsequent siblings)
17 siblings, 1 reply; 27+ messages in thread
From: Christopher Larson @ 2014-09-03 17:27 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
While we're at it, also switch to explicit variable passing rather than
relying on make -e, and pass V=1 so the actual commands hit the logs.
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
.../irda-utils/irda-utils-0.9.18/ldflags.patch | 79 ++++++++++++++++++++++
.../irda-utils/irda-utils_0.9.18.bb | 18 +++--
2 files changed, 92 insertions(+), 5 deletions(-)
create mode 100644 meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch
diff --git a/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch b/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch
new file mode 100644
index 0000000..a79dca7
--- /dev/null
+++ b/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch
@@ -0,0 +1,79 @@
+---
+ findchip/Makefile | 2 +-
+ irattach/Makefile | 4 ++--
+ irdadump/Makefile | 2 +-
+ irdaping/Makefile | 2 +-
+ irnetd/Makefile | 2 +-
+ psion/Makefile | 2 +-
+ 6 files changed, 7 insertions(+), 7 deletions(-)
+
+--- irda-utils-0.9.18.orig/findchip/Makefile
++++ irda-utils-0.9.18/findchip/Makefile
+@@ -65,5 +65,5 @@ install: findchip
+
+ gfindchip: gfindchip.c
+ $(prn_cc)
+- $(ECMD))$(CC) $(CFLAGS) `gtk-config --cflags` $< -o $@ `gtk-config --libs`
++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) `gtk-config --cflags` $< -o $@ `gtk-config --libs`
+
+--- irda-utils-0.9.18.orig/irattach/Makefile
++++ irda-utils-0.9.18/irattach/Makefile
+@@ -49,13 +49,13 @@ all: $(TARGETS)
+
+ irattach: irattach.o util.o
+ $(prn_cc_o)
+- $(ECMD)$(CC) $(CFLAGS) irattach.o util.o -o $@
++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) irattach.o util.o -o $@
+
+
+
+ dongle_attach: dongle_attach.o
+ $(prn_cc_o)
+- $(ECMD)$(CC) $(CFLAGS) dongle_attach.o -o $@
++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) dongle_attach.o -o $@
+
+
+ install: $(TARGETS)
+--- irda-utils-0.9.18.orig/irdadump/Makefile
++++ irda-utils-0.9.18/irdadump/Makefile
+@@ -40,7 +40,7 @@ lib_irdadump.a: $(LIBIRDADUMP_OBJS)
+
+ irdadump: $(IRDADUMP_OBJS) $(LIBIRDADUMP_TARGET)
+ $(prn_cc_o)
+- $(ECMD)$(CC) $(CFLAGS) `pkg-config --libs glib-2.0` -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET)
++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) `pkg-config --libs glib-2.0` -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET)
+
+
+ .c.o:
+--- irda-utils-0.9.18.orig/irdaping/Makefile
++++ irda-utils-0.9.18/irdaping/Makefile
+@@ -56,7 +56,7 @@ all: $(TARGETS)
+
+ irdaping: $(OBJS)
+ $(prn_cc_o)
+- $(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@
++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@
+
+
+ .c.o:
+--- irda-utils-0.9.18.orig/irnetd/Makefile
++++ irda-utils-0.9.18/irnetd/Makefile
+@@ -50,7 +50,7 @@ all: $(TARGETS)
+
+ irnetd: $(OBJS)
+ $(prn_cc_o)
+- $(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@
++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@
+
+
+ install: irnetd
+--- irda-utils-0.9.18.orig/psion/Makefile
++++ irda-utils-0.9.18/psion/Makefile
+@@ -25,4 +25,4 @@ install: $(PSION_TARGETS)
+ CFLAGS += -g -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS)
+ irpsion5:
+ $(prn_cc_o)
+- $(ECMD)$(CC) $(CFLAGS) $(PSION_SRC) -o $@
+\ No newline at end of file
++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(PSION_SRC) -o $@
+\ No newline at end of file
diff --git a/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb b/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb
index 7403dc9..21891b2 100644
--- a/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb
+++ b/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb
@@ -12,21 +12,29 @@ LIC_FILES_CHKSUM = "file://irdadump/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f
file://irdadump/irdadump.c;beginline=1;endline=24;md5=d78b9dce3cd78c2220250c9c7a2be178"
SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \
- file://init"
+ file://ldflags.patch \
+ file://init"
SRC_URI[md5sum] = "84dc12aa4c3f61fccb8d8919bf4079bb"
SRC_URI[sha256sum] = "61980551e46b2eaa9e17ad31cbc1a638074611fc33bff34163d10c7a67a9fdc6"
-export SYS_INCLUDES="-I${STAGING_INCDIR}"
-
inherit autotools-brokensep update-rc.d
+EXTRA_OEMAKE = "\
+ 'CC=${CC}' \
+ 'LD=${LD}' \
+ 'CFLAGS=${CFLAGS}' \
+ 'LDFLAGS=${LDFLAGS}' \
+ 'SYS_INCLUDES=' \
+ 'V=1' \
+"
+
INITSCRIPT_NAME = "irattach"
INITSCRIPT_PARAMS = "defaults 20"
do_compile () {
- oe_runmake -e -C irattach
- oe_runmake -e -C irdaping
+ oe_runmake -C irattach
+ oe_runmake -C irdaping
}
do_install () {
--
1.8.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 8/8] python: obey LDFLAGS
2014-09-03 17:27 [PATCH 0/8] Various fixes to obey LDFLAGS Christopher Larson
` (6 preceding siblings ...)
2014-09-03 17:27 ` [PATCH 7/8] irda-utils: obey LDFLAGS Christopher Larson
@ 2014-09-03 17:27 ` Christopher Larson
2014-09-17 1:16 ` [PATCHv2 0/8] Various fixes to " Christopher Larson
` (9 subsequent siblings)
17 siblings, 0 replies; 27+ messages in thread
From: Christopher Larson @ 2014-09-03 17:27 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
There was a remnant line which altered the LDFLAGS in Makefile to add
-L${STAGING_LIBDIR}. This isn't necessary with the --sysroot= bits, and it was
blowing away the correct LDFLAGS picked up by ./configure.
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
meta/recipes-devtools/python/python_2.7.3.bb | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/python/python_2.7.3.bb b/meta/recipes-devtools/python/python_2.7.3.bb
index 58bcced..109b733 100644
--- a/meta/recipes-devtools/python/python_2.7.3.bb
+++ b/meta/recipes-devtools/python/python_2.7.3.bb
@@ -75,8 +75,7 @@ do_compile() {
if [ ! -f Makefile.orig ]; then
install -m 0644 Makefile Makefile.orig
fi
- sed -i -e 's,^LDFLAGS=.*,LDFLAGS=-L. -L${STAGING_LIBDIR},g' \
- -e 's,libdir=${libdir},libdir=${STAGING_LIBDIR},g' \
+ sed -i -e 's,libdir=${libdir},libdir=${STAGING_LIBDIR},g' \
-e 's,libexecdir=${libexecdir},libexecdir=${STAGING_DIR_HOST}${libexecdir},g' \
-e 's,^LIBDIR=.*,LIBDIR=${STAGING_LIBDIR},g' \
-e 's,includedir=${includedir},includedir=${STAGING_INCDIR},g' \
--
1.8.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* Re: [PATCH 3/8] ossp-uuid: obey LDFLAGS
2014-09-03 17:27 ` [PATCH 3/8] ossp-uuid: " Christopher Larson
@ 2014-09-04 10:39 ` Burton, Ross
0 siblings, 0 replies; 27+ messages in thread
From: Burton, Ross @ 2014-09-04 10:39 UTC (permalink / raw)
To: Christopher Larson; +Cc: Christopher Larson, OE-core
On 3 September 2014 18:27, Christopher Larson <kergoth@gmail.com> wrote:
> +++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch
Missing patch header.
Ross
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 4/8] setserial: obey LDFLAGS
2014-09-03 17:27 ` [PATCH 4/8] setserial: " Christopher Larson
@ 2014-09-04 10:39 ` Burton, Ross
0 siblings, 0 replies; 27+ messages in thread
From: Burton, Ross @ 2014-09-04 10:39 UTC (permalink / raw)
To: Christopher Larson; +Cc: Christopher Larson, OE-core
On 3 September 2014 18:27, Christopher Larson <kergoth@gmail.com> wrote:
> +++ b/meta/recipes-bsp/setserial/setserial/ldflags.patch
Missing patch header.
Ross
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 7/8] irda-utils: obey LDFLAGS
2014-09-03 17:27 ` [PATCH 7/8] irda-utils: obey LDFLAGS Christopher Larson
@ 2014-09-04 10:48 ` Burton, Ross
0 siblings, 0 replies; 27+ messages in thread
From: Burton, Ross @ 2014-09-04 10:48 UTC (permalink / raw)
To: Christopher Larson; +Cc: Christopher Larson, OE-core
On 3 September 2014 18:27, Christopher Larson <kergoth@gmail.com> wrote:
> +++ b/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch
Missing patch header.
> -export SYS_INCLUDES="-I${STAGING_INCDIR}"
> -
> inherit autotools-brokensep update-rc.d
>
> +EXTRA_OEMAKE = "\
> + 'CC=${CC}' \
> + 'LD=${LD}' \
> + 'CFLAGS=${CFLAGS}' \
> + 'LDFLAGS=${LDFLAGS}' \
> + 'SYS_INCLUDES=' \
> + 'V=1' \
The autotools inherit appears to be redundant and can be removed too
if you're cleaning up the build.
Ross
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 5/8] hostap-utils: obey LDFLAGS
2014-09-03 17:27 ` [PATCH 5/8] hostap-utils: " Christopher Larson
@ 2014-09-04 10:48 ` Burton, Ross
0 siblings, 0 replies; 27+ messages in thread
From: Burton, Ross @ 2014-09-04 10:48 UTC (permalink / raw)
To: Christopher Larson; +Cc: Christopher Larson, OE-core
On 3 September 2014 18:27, Christopher Larson <kergoth@gmail.com> wrote:
> +++ b/meta/recipes-bsp/hostap/hostap-utils-0.4.7/ldflags.patch
Missing header.
Ross
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 6/8] blktrace: obey LDFLAGS for btrecord
2014-09-03 17:27 ` [PATCH 6/8] blktrace: obey LDFLAGS for btrecord Christopher Larson
@ 2014-09-04 10:48 ` Burton, Ross
0 siblings, 0 replies; 27+ messages in thread
From: Burton, Ross @ 2014-09-04 10:48 UTC (permalink / raw)
To: Christopher Larson; +Cc: Christopher Larson, OE-core
On 3 September 2014 18:27, Christopher Larson <kergoth@gmail.com> wrote:
> +++ b/meta/recipes-kernel/blktrace/blktrace/ldflags.patch
Missing header.
Ross
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCHv2 0/8] Various fixes to obey LDFLAGS
2014-09-03 17:27 [PATCH 0/8] Various fixes to obey LDFLAGS Christopher Larson
` (7 preceding siblings ...)
2014-09-03 17:27 ` [PATCH 8/8] python: " Christopher Larson
@ 2014-09-17 1:16 ` Christopher Larson
2014-09-17 1:16 ` [PATCH v2 1/8] zlib: obey LDFLAGS for tests Christopher Larson
` (8 subsequent siblings)
17 siblings, 0 replies; 27+ messages in thread
From: Christopher Larson @ 2014-09-17 1:16 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
This patch series fixes 8 recipes to obey LDFLAGS. These issues are easy to
miss, now that the internal toolchain defaults to passing the correct
GNU_HASH, so GNU_HASH warnings when LDFLAGS isn't obeyed are only seen when
using an external toolchain. These were kept in meta-sourcery or meta-mentor,
but given these are general correctness fixes, regardless of the lack of
warnings for most users, I think they're appropriate for upstream inclusion.
v2 update: added missing patch headers, corrected a bug in the python fix (it introduced a host path contamination issue in do_install, which is now fixed)
This series can be pulled from https://github.com/kergoth/openembedded-core ldflags-fixes
Christopher Larson (8):
zlib: obey LDFLAGS for tests
gdbm-1.8.3: obey LDFLAGS
ossp-uuid: obey LDFLAGS
setserial: obey LDFLAGS
hostap-utils: obey LDFLAGS
blktrace: obey LDFLAGS for btrecord
irda-utils: obey LDFLAGS
python: obey LDFLAGS
.../hostap/hostap-utils-0.4.7/ldflags.patch | 27 ++++++++
meta/recipes-bsp/hostap/hostap-utils_0.4.7.bb | 1 +
meta/recipes-bsp/setserial/setserial/ldflags.patch | 24 +++++++
meta/recipes-bsp/setserial/setserial_2.17.bb | 1 +
.../irda-utils/irda-utils-0.9.18/ldflags.patch | 75 ++++++++++++++++++++++
.../irda-utils/irda-utils_0.9.18.bb | 18 ++++--
.../zlib/zlib-1.2.8/ldflags-tests.patch | 45 +++++++++++++
meta/recipes-core/zlib/zlib_1.2.8.bb | 1 +
.../ossp-uuid/ossp-uuid/ldflags.patch | 26 ++++++++
meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb | 1 +
meta/recipes-devtools/python/python_2.7.3.bb | 2 +-
.../recipes-kernel/blktrace/blktrace/ldflags.patch | 8 ++-
meta/recipes-support/gdbm/gdbm-1.8.3/ldflags.patch | 22 +++++++
meta/recipes-support/gdbm/gdbm_1.8.3.bb | 3 +-
14 files changed, 245 insertions(+), 9 deletions(-)
create mode 100644 meta/recipes-bsp/hostap/hostap-utils-0.4.7/ldflags.patch
create mode 100644 meta/recipes-bsp/setserial/setserial/ldflags.patch
create mode 100644 meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch
create mode 100644 meta/recipes-core/zlib/zlib-1.2.8/ldflags-tests.patch
create mode 100644 meta/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch
create mode 100644 meta/recipes-support/gdbm/gdbm-1.8.3/ldflags.patch
--
1.8.3.4
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH v2 1/8] zlib: obey LDFLAGS for tests
2014-09-03 17:27 [PATCH 0/8] Various fixes to obey LDFLAGS Christopher Larson
` (8 preceding siblings ...)
2014-09-17 1:16 ` [PATCHv2 0/8] Various fixes to " Christopher Larson
@ 2014-09-17 1:16 ` Christopher Larson
2014-09-17 1:16 ` [PATCH v2 2/8] gdbm-1.8.3: obey LDFLAGS Christopher Larson
` (7 subsequent siblings)
17 siblings, 0 replies; 27+ messages in thread
From: Christopher Larson @ 2014-09-17 1:16 UTC (permalink / raw)
To: openembedded-core
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
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v2 2/8] gdbm-1.8.3: obey LDFLAGS
2014-09-03 17:27 [PATCH 0/8] Various fixes to obey LDFLAGS Christopher Larson
` (9 preceding siblings ...)
2014-09-17 1:16 ` [PATCH v2 1/8] zlib: obey LDFLAGS for tests Christopher Larson
@ 2014-09-17 1:16 ` Christopher Larson
2014-09-17 1:16 ` [PATCH v2 3/8] ossp-uuid: " Christopher Larson
` (6 subsequent siblings)
17 siblings, 0 replies; 27+ messages in thread
From: Christopher Larson @ 2014-09-17 1:16 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
meta/recipes-support/gdbm/gdbm-1.8.3/ldflags.patch | 22 ++++++++++++++++++++++
meta/recipes-support/gdbm/gdbm_1.8.3.bb | 3 ++-
2 files changed, 24 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-support/gdbm/gdbm-1.8.3/ldflags.patch
diff --git a/meta/recipes-support/gdbm/gdbm-1.8.3/ldflags.patch b/meta/recipes-support/gdbm/gdbm-1.8.3/ldflags.patch
new file mode 100644
index 0000000..770d8f6
--- /dev/null
+++ b/meta/recipes-support/gdbm/gdbm-1.8.3/ldflags.patch
@@ -0,0 +1,22 @@
+Obey LDFLAGS
+
+Signed-off-by: Christopher Larson <chris_larson@mentor.com>
+Upstream-status: Inappropriate [old version]
+
+--- gdbm-1.8.3.orig/Makefile.in
++++ gdbm-1.8.3/Makefile.in
+@@ -156,12 +156,12 @@ install-compat:
+
+ libgdbm.la: $(LOBJS) gdbm.h
+ rm -f libgdbm.la
+- $(LIBTOOL) --mode=link $(CC) -o libgdbm.la -rpath $(libdir) \
++ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o libgdbm.la -rpath $(libdir) \
+ -version-info $(SHLIB_VER) $(LOBJS)
+
+ libgdbm_compat.la: $(C_LOBJS) gdbm.h
+ rm -f libgdbm_compat.la
+- $(LIBTOOL) --mode=link $(CC) -o libgdbm_compat.la -rpath $(libdir) \
++ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o libgdbm_compat.la -rpath $(libdir) \
+ -version-info $(SHLIB_VER) $(C_LOBJS)
+
+ gdbm.h: gdbm.proto gdbmerrno.h gdbm.proto2
diff --git a/meta/recipes-support/gdbm/gdbm_1.8.3.bb b/meta/recipes-support/gdbm/gdbm_1.8.3.bb
index aecf47a..2331d1d 100644
--- a/meta/recipes-support/gdbm/gdbm_1.8.3.bb
+++ b/meta/recipes-support/gdbm/gdbm_1.8.3.bb
@@ -8,7 +8,8 @@ PR = "r4"
SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \
file://makefile.patch \
- file://libtool-mode.patch"
+ file://libtool-mode.patch \
+ file://ldflags.patch"
SRC_URI[md5sum] = "1d1b1d5c0245b1c00aff92da751e9aa1"
SRC_URI[sha256sum] = "cc340338a2e28b40058ab9eb5354a21d53f88a1582ea21ba0bb185c37a281dc9"
--
1.8.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v2 3/8] ossp-uuid: obey LDFLAGS
2014-09-03 17:27 [PATCH 0/8] Various fixes to obey LDFLAGS Christopher Larson
` (10 preceding siblings ...)
2014-09-17 1:16 ` [PATCH v2 2/8] gdbm-1.8.3: obey LDFLAGS Christopher Larson
@ 2014-09-17 1:16 ` Christopher Larson
2014-09-17 1:16 ` [PATCH v2 4/8] setserial: " Christopher Larson
` (5 subsequent siblings)
17 siblings, 0 replies; 27+ messages in thread
From: Christopher Larson @ 2014-09-17 1:16 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
.../ossp-uuid/ossp-uuid/ldflags.patch | 26 ++++++++++++++++++++++
meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb | 1 +
2 files changed, 27 insertions(+)
create mode 100644 meta/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch b/meta/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch
new file mode 100644
index 0000000..f4f0ef8
--- /dev/null
+++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch
@@ -0,0 +1,26 @@
+Obey LDFLAGS
+
+Signed-off-by: Christopher Larson <chris_larson@mentor.com>
+Upstream-status: Pending
+
+--- uuid-1.6.2.orig/Makefile.in
++++ uuid-1.6.2/Makefile.in
+@@ -113,15 +113,15 @@ all: $(TARGETS)
+ @$(LIBTOOL) --mode=compile $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+ $(LIB_NAME): $(LIB_OBJS)
+- @$(LIBTOOL) --mode=link $(CC) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) \
++ @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) \
+ -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h`
+
+ $(DCE_NAME): $(DCE_OBJS)
+- @$(LIBTOOL) --mode=link $(CC) -o $(DCE_NAME) $(DCE_OBJS) -rpath $(libdir) \
++ @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(DCE_NAME) $(DCE_OBJS) -rpath $(libdir) \
+ -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h`
+
+ $(CXX_NAME): $(CXX_OBJS)
+- @$(LIBTOOL) --mode=link $(CXX) -o $(CXX_NAME) $(CXX_OBJS) -rpath $(libdir) \
++ @$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $(CXX_NAME) $(CXX_OBJS) -rpath $(libdir) \
+ -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h`
+
+ $(PRG_NAME): $(PRG_OBJS) $(LIB_NAME)
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb b/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb
index f524854..160990c 100644
--- a/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb
+++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb
@@ -25,6 +25,7 @@ SRC_URI = "http://gnome-build-stage-1.googlecode.com/files/uuid-1.6.2.tar.gz \
file://uuid-libtool.patch \
file://uuid-nostrip.patch \
file://install-pc.patch \
+ file://ldflags.patch \
"
SRC_URI[md5sum] = "5db0d43a9022a6ebbbc25337ae28942f"
SRC_URI[sha256sum] = "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0"
--
1.8.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v2 4/8] setserial: obey LDFLAGS
2014-09-03 17:27 [PATCH 0/8] Various fixes to obey LDFLAGS Christopher Larson
` (11 preceding siblings ...)
2014-09-17 1:16 ` [PATCH v2 3/8] ossp-uuid: " Christopher Larson
@ 2014-09-17 1:16 ` Christopher Larson
2014-09-17 1:16 ` [PATCH v2 5/8] hostap-utils: " Christopher Larson
` (4 subsequent siblings)
17 siblings, 0 replies; 27+ messages in thread
From: Christopher Larson @ 2014-09-17 1:16 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
meta/recipes-bsp/setserial/setserial/ldflags.patch | 24 ++++++++++++++++++++++
meta/recipes-bsp/setserial/setserial_2.17.bb | 1 +
2 files changed, 25 insertions(+)
create mode 100644 meta/recipes-bsp/setserial/setserial/ldflags.patch
diff --git a/meta/recipes-bsp/setserial/setserial/ldflags.patch b/meta/recipes-bsp/setserial/setserial/ldflags.patch
new file mode 100644
index 0000000..4313d2c
--- /dev/null
+++ b/meta/recipes-bsp/setserial/setserial/ldflags.patch
@@ -0,0 +1,24 @@
+Obey LDFLAGS
+
+Signed-off-by: Christopher Larson <chris_larson@mentor.com>
+Upstream-status: Pending
+
+--- setserial-2.17.orig/Makefile.in
++++ setserial-2.17/Makefile.in
+@@ -13,6 +13,7 @@ STRIP = @STRIP@
+ CC = @CC@
+ RM = rm -f
+ CFLAGS = @CFLAGS@
++LDFLAGS = @LDFLAGS@
+ DEFS = @DEFS@
+ INCS = -I.
+ TAR = tar
+@@ -20,7 +21,7 @@ TAR = tar
+ all: setserial setserial.cat
+
+ setserial: setserial.c
+- $(CC) $(CFLAGS) $(DEFS) $(INCS) setserial.c -o setserial
++ $(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) $(INCS) setserial.c -o setserial
+
+ setserial.cat: setserial.8
+ nroff -man setserial.8 > setserial.cat
diff --git a/meta/recipes-bsp/setserial/setserial_2.17.bb b/meta/recipes-bsp/setserial/setserial_2.17.bb
index f1e8cd3..8dbddd7 100644
--- a/meta/recipes-bsp/setserial/setserial_2.17.bb
+++ b/meta/recipes-bsp/setserial/setserial_2.17.bb
@@ -14,6 +14,7 @@ inherit autotools-brokensep
SRC_URI = "${SOURCEFORGE_MIRROR}/setserial/${BPN}-${PV}.tar.gz \
file://add_stdlib.patch \
+ file://ldflags.patch \
"
SRC_URI[md5sum] = "c4867d72c41564318e0107745eb7a0f2"
--
1.8.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v2 5/8] hostap-utils: obey LDFLAGS
2014-09-03 17:27 [PATCH 0/8] Various fixes to obey LDFLAGS Christopher Larson
` (12 preceding siblings ...)
2014-09-17 1:16 ` [PATCH v2 4/8] setserial: " Christopher Larson
@ 2014-09-17 1:16 ` Christopher Larson
2014-09-17 1:17 ` [PATCH v2 6/8] blktrace: obey LDFLAGS for btrecord Christopher Larson
` (3 subsequent siblings)
17 siblings, 0 replies; 27+ messages in thread
From: Christopher Larson @ 2014-09-17 1:16 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
.../hostap/hostap-utils-0.4.7/ldflags.patch | 27 ++++++++++++++++++++++
meta/recipes-bsp/hostap/hostap-utils_0.4.7.bb | 1 +
2 files changed, 28 insertions(+)
create mode 100644 meta/recipes-bsp/hostap/hostap-utils-0.4.7/ldflags.patch
diff --git a/meta/recipes-bsp/hostap/hostap-utils-0.4.7/ldflags.patch b/meta/recipes-bsp/hostap/hostap-utils-0.4.7/ldflags.patch
new file mode 100644
index 0000000..c4655cf
--- /dev/null
+++ b/meta/recipes-bsp/hostap/hostap-utils-0.4.7/ldflags.patch
@@ -0,0 +1,27 @@
+Obey LDFLAGS
+
+Signed-off-by: Christopher Larson <chris_larson@mentor.com>
+Upstream-status: Pending
+
+--- hostap-utils-0.4.7.orig/Makefile
++++ hostap-utils-0.4.7/Makefile
+@@ -14,17 +14,17 @@ prism2_srec.o: prism2_srec.c util.h
+ hostap_crypt_conf: hostap_crypt_conf.c
+
+ hostap_diag: hostap_diag.o util.o
+- $(CC) -o hostap_diag $(CFLAGS) hostap_diag.o util.o
++ $(CC) -o hostap_diag $(CFLAGS) $(LDFLAGS) hostap_diag.o util.o
+
+ hostap_diag.o: hostap_diag.c util.h
+
+ util.o: util.c util.h
+
+ hostap_io_debug: hostap_io_debug.c
+- $(CC) -o hostap_io_debug $(CFLAGS) hostap_io_debug.c
++ $(CC) -o hostap_io_debug $(CFLAGS) $(LDFLAGS) hostap_io_debug.c
+
+ hostap_rid: hostap_rid.o util.o
+- $(CC) -o hostap_rid $(CFLAGS) hostap_rid.o util.o
++ $(CC) -o hostap_rid $(CFLAGS) $(LDFLAGS) hostap_rid.o util.o
+
+ hostap_rid.o: hostap_rid.c util.h
diff --git a/meta/recipes-bsp/hostap/hostap-utils_0.4.7.bb b/meta/recipes-bsp/hostap/hostap-utils_0.4.7.bb
index 7b224a8..be5481f 100644
--- a/meta/recipes-bsp/hostap/hostap-utils_0.4.7.bb
+++ b/meta/recipes-bsp/hostap/hostap-utils_0.4.7.bb
@@ -1,4 +1,5 @@
require hostap-utils.inc
+SRC_URI += "file://ldflags.patch"
SRC_URI[md5sum] = "afe041581b8f01666e353bec20917c85"
SRC_URI[sha256sum] = "c6f598d8e356c1620fa009eca0a700bf1105e16817eefd77d891994261009355"
--
1.8.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v2 6/8] blktrace: obey LDFLAGS for btrecord
2014-09-03 17:27 [PATCH 0/8] Various fixes to obey LDFLAGS Christopher Larson
` (13 preceding siblings ...)
2014-09-17 1:16 ` [PATCH v2 5/8] hostap-utils: " Christopher Larson
@ 2014-09-17 1:17 ` Christopher Larson
2014-09-18 7:26 ` Khem Raj
2014-09-17 1:17 ` [PATCH v2 7/8] irda-utils: obey LDFLAGS Christopher Larson
` (2 subsequent siblings)
17 siblings, 1 reply; 27+ messages in thread
From: Christopher Larson @ 2014-09-17 1:17 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
meta/recipes-kernel/blktrace/blktrace/ldflags.patch | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-kernel/blktrace/blktrace/ldflags.patch b/meta/recipes-kernel/blktrace/blktrace/ldflags.patch
index b9c7c20..037d161 100644
--- a/meta/recipes-kernel/blktrace/blktrace/ldflags.patch
+++ b/meta/recipes-kernel/blktrace/blktrace/ldflags.patch
@@ -59,8 +59,12 @@ Signed-off-by: Fahad Usman <fahad_usman@mentor.com>
INCS = -I. -I.. -I../btt
OCFLAGS = -UCOUNT_IOS -UDEBUG -DNDEBUG
XCFLAGS = -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-@@ -35,7 +36,7 @@ btrecord: btrecord.o
- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^)
+@@ -32,10 +33,10 @@ clean: docsclean
+ $(CC) $(CFLAGS) -c -o $*.o $<
+
+ btrecord: btrecord.o
+- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^)
++ $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LDFLAGS)
btreplay: btreplay.o
- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
--
1.8.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v2 7/8] irda-utils: obey LDFLAGS
2014-09-03 17:27 [PATCH 0/8] Various fixes to obey LDFLAGS Christopher Larson
` (14 preceding siblings ...)
2014-09-17 1:17 ` [PATCH v2 6/8] blktrace: obey LDFLAGS for btrecord Christopher Larson
@ 2014-09-17 1:17 ` 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
17 siblings, 0 replies; 27+ messages in thread
From: Christopher Larson @ 2014-09-17 1:17 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
While we're at it, also switch to explicit variable passing rather than
relying on make -e, and pass V=1 so the actual commands hit the logs.
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
.../irda-utils/irda-utils-0.9.18/ldflags.patch | 75 ++++++++++++++++++++++
.../irda-utils/irda-utils_0.9.18.bb | 18 ++++--
2 files changed, 88 insertions(+), 5 deletions(-)
create mode 100644 meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch
diff --git a/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch b/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch
new file mode 100644
index 0000000..2cdd1ac
--- /dev/null
+++ b/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch
@@ -0,0 +1,75 @@
+Obey LDFLAGS
+
+Signed-off-by: Christopher Larson <chris_larson@mentor.com>
+Upstream-status: Pending
+
+--- irda-utils-0.9.18.orig/findchip/Makefile
++++ irda-utils-0.9.18/findchip/Makefile
+@@ -65,5 +65,5 @@ install: findchip
+
+ gfindchip: gfindchip.c
+ $(prn_cc)
+- $(ECMD))$(CC) $(CFLAGS) `gtk-config --cflags` $< -o $@ `gtk-config --libs`
++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) `gtk-config --cflags` $< -o $@ `gtk-config --libs`
+
+--- irda-utils-0.9.18.orig/irattach/Makefile
++++ irda-utils-0.9.18/irattach/Makefile
+@@ -49,13 +49,13 @@ all: $(TARGETS)
+
+ irattach: irattach.o util.o
+ $(prn_cc_o)
+- $(ECMD)$(CC) $(CFLAGS) irattach.o util.o -o $@
++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) irattach.o util.o -o $@
+
+
+
+ dongle_attach: dongle_attach.o
+ $(prn_cc_o)
+- $(ECMD)$(CC) $(CFLAGS) dongle_attach.o -o $@
++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) dongle_attach.o -o $@
+
+
+ install: $(TARGETS)
+--- irda-utils-0.9.18.orig/irdadump/Makefile
++++ irda-utils-0.9.18/irdadump/Makefile
+@@ -40,7 +40,7 @@ lib_irdadump.a: $(LIBIRDADUMP_OBJS)
+
+ irdadump: $(IRDADUMP_OBJS) $(LIBIRDADUMP_TARGET)
+ $(prn_cc_o)
+- $(ECMD)$(CC) $(CFLAGS) `pkg-config --libs glib-2.0` -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET)
++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) `pkg-config --libs glib-2.0` -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET)
+
+
+ .c.o:
+--- irda-utils-0.9.18.orig/irdaping/Makefile
++++ irda-utils-0.9.18/irdaping/Makefile
+@@ -56,7 +56,7 @@ all: $(TARGETS)
+
+ irdaping: $(OBJS)
+ $(prn_cc_o)
+- $(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@
++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@
+
+
+ .c.o:
+--- irda-utils-0.9.18.orig/irnetd/Makefile
++++ irda-utils-0.9.18/irnetd/Makefile
+@@ -50,7 +50,7 @@ all: $(TARGETS)
+
+ irnetd: $(OBJS)
+ $(prn_cc_o)
+- $(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@
++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@
+
+
+ install: irnetd
+--- irda-utils-0.9.18.orig/psion/Makefile
++++ irda-utils-0.9.18/psion/Makefile
+@@ -25,4 +25,4 @@ install: $(PSION_TARGETS)
+ CFLAGS += -g -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS)
+ irpsion5:
+ $(prn_cc_o)
+- $(ECMD)$(CC) $(CFLAGS) $(PSION_SRC) -o $@
+\ No newline at end of file
++ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(PSION_SRC) -o $@
+\ No newline at end of file
diff --git a/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb b/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb
index 7403dc9..21891b2 100644
--- a/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb
+++ b/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb
@@ -12,21 +12,29 @@ LIC_FILES_CHKSUM = "file://irdadump/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f
file://irdadump/irdadump.c;beginline=1;endline=24;md5=d78b9dce3cd78c2220250c9c7a2be178"
SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \
- file://init"
+ file://ldflags.patch \
+ file://init"
SRC_URI[md5sum] = "84dc12aa4c3f61fccb8d8919bf4079bb"
SRC_URI[sha256sum] = "61980551e46b2eaa9e17ad31cbc1a638074611fc33bff34163d10c7a67a9fdc6"
-export SYS_INCLUDES="-I${STAGING_INCDIR}"
-
inherit autotools-brokensep update-rc.d
+EXTRA_OEMAKE = "\
+ 'CC=${CC}' \
+ 'LD=${LD}' \
+ 'CFLAGS=${CFLAGS}' \
+ 'LDFLAGS=${LDFLAGS}' \
+ 'SYS_INCLUDES=' \
+ 'V=1' \
+"
+
INITSCRIPT_NAME = "irattach"
INITSCRIPT_PARAMS = "defaults 20"
do_compile () {
- oe_runmake -e -C irattach
- oe_runmake -e -C irdaping
+ oe_runmake -C irattach
+ oe_runmake -C irdaping
}
do_install () {
--
1.8.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH v2 8/8] python: obey LDFLAGS
2014-09-03 17:27 [PATCH 0/8] Various fixes to obey LDFLAGS Christopher Larson
` (15 preceding siblings ...)
2014-09-17 1:17 ` [PATCH v2 7/8] irda-utils: obey LDFLAGS Christopher Larson
@ 2014-09-17 1:17 ` Christopher Larson
2014-09-18 7:30 ` [PATCH 0/8] Various fixes to " Khem Raj
17 siblings, 0 replies; 27+ messages in thread
From: Christopher Larson @ 2014-09-17 1:17 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
meta/recipes-devtools/python/python_2.7.3.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/python/python_2.7.3.bb b/meta/recipes-devtools/python/python_2.7.3.bb
index 58bcced..d93bc64 100644
--- a/meta/recipes-devtools/python/python_2.7.3.bb
+++ b/meta/recipes-devtools/python/python_2.7.3.bb
@@ -75,7 +75,7 @@ do_compile() {
if [ ! -f Makefile.orig ]; then
install -m 0644 Makefile Makefile.orig
fi
- sed -i -e 's,^LDFLAGS=.*,LDFLAGS=-L. -L${STAGING_LIBDIR},g' \
+ sed -i -e 's#^LDFLAGS=.*#LDFLAGS=${LDFLAGS} -L. -L${STAGING_LIBDIR}#g' \
-e 's,libdir=${libdir},libdir=${STAGING_LIBDIR},g' \
-e 's,libexecdir=${libexecdir},libexecdir=${STAGING_DIR_HOST}${libexecdir},g' \
-e 's,^LIBDIR=.*,LIBDIR=${STAGING_LIBDIR},g' \
--
1.8.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* Re: [PATCH v2 6/8] blktrace: obey LDFLAGS for btrecord
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
0 siblings, 1 reply; 27+ messages in thread
From: Khem Raj @ 2014-09-18 7:26 UTC (permalink / raw)
To: openembedded-core
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 9/16/14 6:17 PM, Christopher Larson wrote:
> From: Christopher Larson <chris_larson@mentor.com>
>
> Signed-off-by: Christopher Larson <chris_larson@mentor.com>
> ---
> meta/recipes-kernel/blktrace/blktrace/ldflags.patch | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-kernel/blktrace/blktrace/ldflags.patch b/meta/recipes-kernel/blktrace/blktrace/ldflags.patch
> index b9c7c20..037d161 100644
> --- a/meta/recipes-kernel/blktrace/blktrace/ldflags.patch
> +++ b/meta/recipes-kernel/blktrace/blktrace/ldflags.patch
> @@ -59,8 +59,12 @@ Signed-off-by: Fahad Usman <fahad_usman@mentor.com>
> INCS = -I. -I.. -I../btt
> OCFLAGS = -UCOUNT_IOS -UDEBUG -DNDEBUG
> XCFLAGS = -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
> -@@ -35,7 +36,7 @@ btrecord: btrecord.o
> - $(CC) $(CFLAGS) -o $@ $(filter %.o,$^)
> +@@ -32,10 +33,10 @@ clean: docsclean
> + $(CC) $(CFLAGS) -c -o $*.o $<
> +
> + btrecord: btrecord.o
> +- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^)
> ++ $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LDFLAGS)
>
aren't you passing LDFLAGS to compile step as well here ?
> btreplay: btreplay.o
> - $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
>
- --
- -Khem
-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
Comment: GPGTools - https://gpgtools.org
iEYEARECAAYFAlQaiQoACgkQuwUzVZGdMxT8RgCeOnVS1P+8kPTGj+GbRQfGSPyb
NMAAmgKJL65/3Y5ot35pALZv8ZgRHxQ0
=DxWh
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 0/8] Various fixes to obey LDFLAGS
2014-09-03 17:27 [PATCH 0/8] Various fixes to obey LDFLAGS Christopher Larson
` (16 preceding siblings ...)
2014-09-17 1:17 ` [PATCH v2 8/8] python: " Christopher Larson
@ 2014-09-18 7:30 ` Khem Raj
17 siblings, 0 replies; 27+ messages in thread
From: Khem Raj @ 2014-09-18 7:30 UTC (permalink / raw)
To: openembedded-core
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 9/3/14 10:27 AM, Christopher Larson wrote:
> From: Christopher Larson <chris_larson@mentor.com>
>
> This patch series fixes 8 recipes to obey LDFLAGS. These issues are easy to
> miss, now that the internal toolchain defaults to passing the correct
> GNU_HASH, so GNU_HASH warnings when LDFLAGS isn't obeyed are only seen when
> using an external toolchain. These were kept in meta-sourcery or meta-mentor,
> but given these are general correctness fixes, regardless of the lack of
> warnings for most users, I think they're appropriate for upstream inclusion.
may be they should be sent to respective component upstreams first
>
> The following changes since commit e72aac2ae9e5fce1715fa04b7e94034fd06892d9:
>
> alsa-lib: libasound should runtime depends on alsa-conf (2014-09-03 11:30:11 +0100)
>
> are available in the git repository at:
>
> git@github.com:kergoth/openembedded-core ldflags-fixes
> https://github.com/kergoth/openembedded-core ldflags-fixes
>
> for you to fetch changes up to 2cddd349eb9cafbbaf5257fb61beb9dc249df85c:
>
> python: obey LDFLAGS (2014-09-03 10:18:37 -0700)
>
> ----------------------------------------------------------------
> Christopher Larson (8):
> zlib: obey LDFLAGS for tests
> gdbm-1.8.3: obey LDFLAGS
> ossp-uuid: obey LDFLAGS
> setserial: obey LDFLAGS
> hostap-utils: obey LDFLAGS
> blktrace: obey LDFLAGS for btrecord
> irda-utils: obey LDFLAGS
> python: obey LDFLAGS
>
> .../hostap/hostap-utils-0.4.7/ldflags.patch | 27 ++++++++
> meta/recipes-bsp/hostap/hostap-utils_0.4.7.bb | 1 +
> meta/recipes-bsp/setserial/setserial/ldflags.patch | 23 +++++++
> meta/recipes-bsp/setserial/setserial_2.17.bb | 1 +
> .../irda-utils/irda-utils-0.9.18/ldflags.patch | 79 ++++++++++++++++++++++
> .../irda-utils/irda-utils_0.9.18.bb | 18 +++--
> .../zlib/zlib-1.2.8/ldflags-tests.patch | 45 ++++++++++++
> meta/recipes-core/zlib/zlib_1.2.8.bb | 1 +
> .../ossp-uuid/ossp-uuid/ldflags.patch | 23 +++++++
> meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb | 1 +
> meta/recipes-devtools/python/python_2.7.3.bb | 3 +-
> .../recipes-kernel/blktrace/blktrace/ldflags.patch | 8 ++-
> meta/recipes-support/gdbm/gdbm-1.8.3/ldflags.patch | 22 ++++++
> meta/recipes-support/gdbm/gdbm_1.8.3.bb | 3 +-
> 14 files changed, 245 insertions(+), 10 deletions(-)
> create mode 100644 meta/recipes-bsp/hostap/hostap-utils-0.4.7/ldflags.patch
> create mode 100644 meta/recipes-bsp/setserial/setserial/ldflags.patch
> create mode 100644 meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch
> create mode 100644 meta/recipes-core/zlib/zlib-1.2.8/ldflags-tests.patch
> create mode 100644 meta/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch
> create mode 100644 meta/recipes-support/gdbm/gdbm-1.8.3/ldflags.patch
>
- --
- -Khem
-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
Comment: GPGTools - https://gpgtools.org
iEYEARECAAYFAlQaif4ACgkQuwUzVZGdMxSgGACdGG6xSxCtB+8Fe71rw7Uscd/H
LA4AmgNOrOnTSCYUFDTjPPMXsgmnMejp
=IrqW
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v2 6/8] blktrace: obey LDFLAGS for btrecord
2014-09-18 7:26 ` Khem Raj
@ 2014-09-18 20:51 ` Christopher Larson
2014-09-19 4:42 ` Khem Raj
0 siblings, 1 reply; 27+ messages in thread
From: Christopher Larson @ 2014-09-18 20:51 UTC (permalink / raw)
To: Khem Raj; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 1622 bytes --]
On Thu, Sep 18, 2014 at 12:26 AM, Khem Raj <raj.khem@gmail.com> wrote:
> On 9/16/14 6:17 PM, Christopher Larson wrote:
> > From: Christopher Larson <chris_larson@mentor.com>
> >
> > Signed-off-by: Christopher Larson <chris_larson@mentor.com>
> > ---
> > meta/recipes-kernel/blktrace/blktrace/ldflags.patch | 8 ++++++--
> > 1 file changed, 6 insertions(+), 2 deletions(-)
> >
> > diff --git a/meta/recipes-kernel/blktrace/blktrace/ldflags.patch
> b/meta/recipes-kernel/blktrace/blktrace/ldflags.patch
> > index b9c7c20..037d161 100644
> > --- a/meta/recipes-kernel/blktrace/blktrace/ldflags.patch
> > +++ b/meta/recipes-kernel/blktrace/blktrace/ldflags.patch
> > @@ -59,8 +59,12 @@ Signed-off-by: Fahad Usman <fahad_usman@mentor.com>
> > INCS = -I. -I.. -I../btt
> > OCFLAGS = -UCOUNT_IOS -UDEBUG -DNDEBUG
> > XCFLAGS = -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
> > -@@ -35,7 +36,7 @@ btrecord: btrecord.o
> > - $(CC) $(CFLAGS) -o $@ $(filter %.o,$^)
> > +@@ -32,10 +33,10 @@ clean: docsclean
> > + $(CC) $(CFLAGS) -c -o $*.o $<
> > +
> > + btrecord: btrecord.o
> > +- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^)
> > ++ $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LDFLAGS)
> >
>
> aren't you passing LDFLAGS to compile step as well here ?
I don't think so. This rule creates btrecord from btrecord.o, it doesn't
compile btrecord.c to btrecord.o, that's an entirely different rule.
--
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics
[-- Attachment #2: Type: text/html, Size: 2301 bytes --]
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH v2 6/8] blktrace: obey LDFLAGS for btrecord
2014-09-18 20:51 ` Christopher Larson
@ 2014-09-19 4:42 ` Khem Raj
0 siblings, 0 replies; 27+ messages in thread
From: Khem Raj @ 2014-09-19 4:42 UTC (permalink / raw)
To: Christopher Larson; +Cc: Patches and discussions about the oe-core layer
On Thu, Sep 18, 2014 at 1:51 PM, Christopher Larson <clarson@kergoth.com> wrote:
>
> On Thu, Sep 18, 2014 at 12:26 AM, Khem Raj <raj.khem@gmail.com> wrote:
>>
>> On 9/16/14 6:17 PM, Christopher Larson wrote:
>> > From: Christopher Larson <chris_larson@mentor.com>
>> >
>> > Signed-off-by: Christopher Larson <chris_larson@mentor.com>
>> > ---
>> > meta/recipes-kernel/blktrace/blktrace/ldflags.patch | 8 ++++++--
>> > 1 file changed, 6 insertions(+), 2 deletions(-)
>> >
>> > diff --git a/meta/recipes-kernel/blktrace/blktrace/ldflags.patch
>> > b/meta/recipes-kernel/blktrace/blktrace/ldflags.patch
>> > index b9c7c20..037d161 100644
>> > --- a/meta/recipes-kernel/blktrace/blktrace/ldflags.patch
>> > +++ b/meta/recipes-kernel/blktrace/blktrace/ldflags.patch
>> > @@ -59,8 +59,12 @@ Signed-off-by: Fahad Usman <fahad_usman@mentor.com>
>> > INCS = -I. -I.. -I../btt
>> > OCFLAGS = -UCOUNT_IOS -UDEBUG -DNDEBUG
>> > XCFLAGS = -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
>> > -@@ -35,7 +36,7 @@ btrecord: btrecord.o
>> > - $(CC) $(CFLAGS) -o $@ $(filter %.o,$^)
>> > +@@ -32,10 +33,10 @@ clean: docsclean
>> > + $(CC) $(CFLAGS) -c -o $*.o $<
>> > +
>> > + btrecord: btrecord.o
>> > +- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^)
>> > ++ $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LDFLAGS)
>> >
>>
>> aren't you passing LDFLAGS to compile step as well here ?
>
>
> I don't think so. This rule creates btrecord from btrecord.o, it doesn't
> compile btrecord.c to btrecord.o, that's an entirely different rule.
thats right. I confused it with filter
^ permalink raw reply [flat|nested] 27+ messages in thread
end of thread, other threads:[~2014-09-19 4:42 UTC | newest]
Thread overview: 27+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` [PATCH v2 1/8] zlib: obey LDFLAGS for tests Christopher Larson
2014-09-17 1:16 ` [PATCH v2 2/8] gdbm-1.8.3: obey LDFLAGS 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
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.