From 61b58e52b9e6439db5577cf22cd61cd97d1d8ab7 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Tue, 2 Sep 2014 14:14:25 -0700 Subject: [PATCH 1/7] gdbm: drop bits now upstream Signed-off-by: Christopher Larson --- core/recipes-support/gdbm/gdbm/ldflags.patch | 21 ------------------- core/recipes-support/gdbm/gdbm_1.8.3.bbappend | 2 -- 2 files changed, 23 deletions(-) delete mode 100644 core/recipes-support/gdbm/gdbm/ldflags.patch delete mode 100644 core/recipes-support/gdbm/gdbm_1.8.3.bbappend diff --git a/core/recipes-support/gdbm/gdbm/ldflags.patch b/core/recipes-support/gdbm/gdbm/ldflags.patch deleted file mode 100644 index cba6bfd..0000000 --- a/core/recipes-support/gdbm/gdbm/ldflags.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- - Makefile.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- 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/core/recipes-support/gdbm/gdbm_1.8.3.bbappend b/core/recipes-support/gdbm/gdbm_1.8.3.bbappend deleted file mode 100644 index de3e499..0000000 --- a/core/recipes-support/gdbm/gdbm_1.8.3.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/gdbm:" -SRC_URI += "file://ldflags.patch" From dd69595447e7261ef3e7993c7bae4421ec4f1468 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Tue, 2 Sep 2014 15:54:03 -0700 Subject: [PATCH 2/7] ossp-uuid: drop bits now upstream Signed-off-by: Christopher Larson --- .../ossp-uuid/ossp-uuid/ldflags.patch | 23 ------------------- .../ossp-uuid/ossp-uuid_1.6.2.bbappend | 2 -- 2 files changed, 25 deletions(-) delete mode 100644 core/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch delete mode 100644 core/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bbappend diff --git a/core/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch b/core/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch deleted file mode 100644 index a4cb455..0000000 --- a/core/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch +++ /dev/null @@ -1,23 +0,0 @@ -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/core/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bbappend b/core/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bbappend deleted file mode 100644 index 0c77414..0000000 --- a/core/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" -SRC_URI += "file://ldflags.patch" From 148980e2024db18b2eea22cee4d45e30078004cf Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Tue, 2 Sep 2014 15:55:22 -0700 Subject: [PATCH 3/7] setserial: drop bits now upstream Signed-off-by: Christopher Larson --- core/recipes-bsp/setserial/ldflags.patch | 23 ------------------- .../setserial/setserial_2.17.bbappend | 2 -- 2 files changed, 25 deletions(-) delete mode 100644 core/recipes-bsp/setserial/ldflags.patch delete mode 100644 core/recipes-bsp/setserial/setserial_2.17.bbappend diff --git a/core/recipes-bsp/setserial/ldflags.patch b/core/recipes-bsp/setserial/ldflags.patch deleted file mode 100644 index 33f23b8..0000000 --- a/core/recipes-bsp/setserial/ldflags.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- - 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/core/recipes-bsp/setserial/setserial_2.17.bbappend b/core/recipes-bsp/setserial/setserial_2.17.bbappend deleted file mode 100644 index 76c02f9..0000000 --- a/core/recipes-bsp/setserial/setserial_2.17.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}:" -SRC_URI += "file://ldflags.patch" From 4de8c4ccfa5fa20159c4370185bcde4b7e04c78d Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Tue, 2 Sep 2014 15:56:40 -0700 Subject: [PATCH 4/7] hostap-utils: drop bits now upstream Signed-off-by: Christopher Larson --- .../hostap/hostap-utils_0.4.7.bbappend | 2 -- core/recipes-bsp/hostap/ldflags.patch | 27 ------------------- 2 files changed, 29 deletions(-) delete mode 100644 core/recipes-bsp/hostap/hostap-utils_0.4.7.bbappend delete mode 100644 core/recipes-bsp/hostap/ldflags.patch diff --git a/core/recipes-bsp/hostap/hostap-utils_0.4.7.bbappend b/core/recipes-bsp/hostap/hostap-utils_0.4.7.bbappend deleted file mode 100644 index 76c02f9..0000000 --- a/core/recipes-bsp/hostap/hostap-utils_0.4.7.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}:" -SRC_URI += "file://ldflags.patch" diff --git a/core/recipes-bsp/hostap/ldflags.patch b/core/recipes-bsp/hostap/ldflags.patch deleted file mode 100644 index fe60303..0000000 --- a/core/recipes-bsp/hostap/ldflags.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- - 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 - From 3d38ed67bab28f571687dcbac1ca736664da3afb Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Tue, 2 Sep 2014 15:59:02 -0700 Subject: [PATCH 5/7] blktrace: drop bits now upstream Signed-off-by: Christopher Larson --- .../blktrace/blktrace_git.bbappend | 1 - core/recipes-kernel/blktrace/ldflags.patch | 93 ------------------- 2 files changed, 94 deletions(-) delete mode 100644 core/recipes-kernel/blktrace/blktrace_git.bbappend delete mode 100644 core/recipes-kernel/blktrace/ldflags.patch diff --git a/core/recipes-kernel/blktrace/blktrace_git.bbappend b/core/recipes-kernel/blktrace/blktrace_git.bbappend deleted file mode 100644 index 34ab5e9..0000000 --- a/core/recipes-kernel/blktrace/blktrace_git.bbappend +++ /dev/null @@ -1 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}:" diff --git a/core/recipes-kernel/blktrace/ldflags.patch b/core/recipes-kernel/blktrace/ldflags.patch deleted file mode 100644 index 3564e51..0000000 --- a/core/recipes-kernel/blktrace/ldflags.patch +++ /dev/null @@ -1,93 +0,0 @@ -blktrace: obey LDFLAGS - -Upstream-Status: Pending - -Signed-off-by: Christopher Larson - -the patch was imported from meta-mentor layer on yoctoproject git server -http://git.yoctoproject.org/cgit/cgit.cgi/meta-mentor as of commit id -aed463414e2e2bf8ca44ba54ee5973e7ed599e57 - -Signed-off-by: Fahad Usman ---- - Makefile | 11 ++++++----- - btreplay/Makefile | 3 ++- - btt/Makefile | 3 ++- - 3 files changed, 10 insertions(+), 7 deletions(-) - ---- git.orig/Makefile -+++ git/Makefile -@@ -1,5 +1,6 @@ - CC = gcc - CFLAGS = -Wall -O2 -g -W -+LDFLAGS = - ALL_CFLAGS = $(CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 - PROGS = blkparse blktrace verify_blkparse blkrawverify blkiomon - LIBS = -lpthread -@@ -23,19 +24,19 @@ btreplay/btreplay: - $(CC) -o $*.o -c $(ALL_CFLAGS) $< - - blkparse: blkparse.o blkparse_fmt.o rbtree.o act_mask.o -- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -+ $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LDFLAGS) - - blktrace: blktrace.o act_mask.o -- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -+ $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) $(LDFLAGS) - - verify_blkparse: verify_blkparse.o -- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -+ $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LDFLAGS) - - blkrawverify: blkrawverify.o -- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -+ $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LDFLAGS) - - blkiomon: blkiomon.o rbtree.o -- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt -+ $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt $(LDFLAGS) - - $(PROGS): | depend - ---- git.orig/btreplay/Makefile -+++ git/btreplay/Makefile -@@ -7,6 +7,7 @@ - - CC = gcc - CFLAGS = -Wall -W -O2 -g -+LDFLAGS = - INCS = -I. -I.. -I../btt - OCFLAGS = -UCOUNT_IOS -UDEBUG -DNDEBUG - XCFLAGS = -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -@@ -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) -+ $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) $(LDFLAGS) - - depend: - @$(CC) -MM $(CFLAGS) *.c 1> .depend ---- git.orig/btt/Makefile -+++ git/btt/Makefile -@@ -7,6 +7,7 @@ - - CC = gcc - CFLAGS = -Wall -W -O2 -g -+LDFLAGS = - INCS = -I. -I.. - XCFLAGS = -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 - override CFLAGS += $(INCS) $(XCFLAGS) -@@ -38,7 +39,7 @@ clean: docsclean - $(CC) $(CFLAGS) -c -o $*.o $< - - btt: $(OBJS) -- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -+ $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) $(LDFLAGS) - - ifneq ($(wildcard .depend),) - include .depend From efea79774596fb37106d0461bdd04f2e131ac0c2 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Tue, 2 Sep 2014 17:01:56 -0700 Subject: [PATCH 6/7] irda-utils: drop bits now upstream Signed-off-by: Christopher Larson --- .../irda-utils/irda-utils/ldflags.patch | 79 ------------------- .../irda-utils/irda-utils_0.9.18.bbappend | 13 --- 2 files changed, 92 deletions(-) delete mode 100644 core/recipes-connectivity/irda-utils/irda-utils/ldflags.patch delete mode 100644 core/recipes-connectivity/irda-utils/irda-utils_0.9.18.bbappend diff --git a/core/recipes-connectivity/irda-utils/irda-utils/ldflags.patch b/core/recipes-connectivity/irda-utils/irda-utils/ldflags.patch deleted file mode 100644 index a79dca7..0000000 --- a/core/recipes-connectivity/irda-utils/irda-utils/ldflags.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- - 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/core/recipes-connectivity/irda-utils/irda-utils_0.9.18.bbappend b/core/recipes-connectivity/irda-utils/irda-utils_0.9.18.bbappend deleted file mode 100644 index 1079e65..0000000 --- a/core/recipes-connectivity/irda-utils/irda-utils_0.9.18.bbappend +++ /dev/null @@ -1,13 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/irda-utils:" -SRC_URI += "file://ldflags.patch" - -EXTRA_OEMAKE = "\ - 'CC=${CC}' \ - 'LD=${LD}' \ - 'CFLAGS=${CFLAGS}' \ - 'LDFLAGS=${LDFLAGS}' \ -" - -do_compile () { - oe_runmake -} From 6a9f8597dda07b0c34aef042fc4f1e70643a9958 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Wed, 3 Sep 2014 09:54:14 -0700 Subject: [PATCH 7/7] python: drop bits now upstream Signed-off-by: Christopher Larson --- core/recipes-devtools/python/python_2.7.3.bbappend | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 core/recipes-devtools/python/python_2.7.3.bbappend diff --git a/core/recipes-devtools/python/python_2.7.3.bbappend b/core/recipes-devtools/python/python_2.7.3.bbappend deleted file mode 100644 index d0c4836..0000000 --- a/core/recipes-devtools/python/python_2.7.3.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -do_compile_prepend () { - sed -i -e 's#^LDFLAGS=.*#LDFLAGS = -L. ${LDFLAGS}#g' Makefile -}