Move GNU_HASH warning fixes here from meta-mentor

Internal toolchains generally don't see these, as they build that toolchain
with the default behavior they expect, so it's appropriate to include these
fixes with the external toolchain configuration, for now.

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
This commit is contained in:
Christopher Larson
2013-05-31 09:38:07 -07:00
parent 079d3ff35d
commit 3b44877887
15 changed files with 374 additions and 0 deletions

View File

@@ -5,4 +5,9 @@ BBFILE_COLLECTIONS += "sourcery"
BBFILE_PRIORITY_sourcery = "10"
BBFILE_PATTERN_sourcery = "^${LAYERDIR}/"
# Let us add layer-specific bbappends which are only applied when that
# layer is included in our configuration
BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.bbappend' % layer \
for layer in BBFILE_COLLECTIONS.split())}"
TCMODE = "external-sourcery"

View File

@@ -0,0 +1,3 @@
PRINC := "${@int(PRINC) + 1}"
FILESEXTRAPATHS_prepend := "${THISDIR}:"
SRC_URI += "file://ldflags.patch"

View File

@@ -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

View File

@@ -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

View File

@@ -0,0 +1,3 @@
PRINC := "${@int(PRINC) + 1}"
FILESEXTRAPATHS_prepend := "${THISDIR}:"
SRC_URI += "file://ldflags.patch"

View File

@@ -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

View File

@@ -0,0 +1,14 @@
PRINC := "${@int(PRINC) + 1}"
FILESEXTRAPATHS_prepend := "${THISDIR}/irda-utils:"
SRC_URI += "file://ldflags.patch"
EXTRA_OEMAKE = "\
'CC=${CC}' \
'LD=${LD}' \
'CFLAGS=${CFLAGS}' \
'LDFLAGS=${LDFLAGS}' \
"
do_compile () {
oe_runmake
}

View File

@@ -0,0 +1,2 @@
PR .= ".1"
CCLD += "${LDFLAGS}"

View File

@@ -0,0 +1,4 @@
PR .= ".1"
do_compile_prepend () {
sed -i -e 's#^LDFLAGS=.*#LDFLAGS = -L. ${LDFLAGS}#g' Makefile
}

View File

@@ -0,0 +1,21 @@
PRINC := "${@int(PRINC) + 1}"
FILESEXTRAPATHS_prepend := "${THISDIR}:"
SRC_URI = "git://git.kernel.dk/blktrace.git;protocol=git \
file://ldflags.patch"
EXTRA_OEMAKE = "\
'CC=${CC}' \
'CFLAGS=${CFLAGS}' \
'LDFLAGS=${LDFLAGS}' \
"
PARALLEL_MAKE = ""
do_compile() {
base_do_compile
}
do_install() {
base_do_install
}

View File

@@ -0,0 +1,78 @@
---
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
@@ -35,7 +36,7 @@ btrecord: btrecord.o
$(CC) $(CFLAGS) -o $@ $(filter %.o,$^)
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

View File

@@ -0,0 +1,21 @@
---
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

View File

@@ -0,0 +1,3 @@
PR .= ".1"
FILESEXTRAPATHS_prepend := "${THISDIR}/gdbm:"
SRC_URI += "file://ldflags.patch"

View File

@@ -0,0 +1,4 @@
PRINC := "${@int(PRINC) + 1}"
FILESEXTRAPATHS_prepend := "${THISDIR}:"
SRC_URI += "file://ldflags.patch"
EXTRA_OEMAKE += "'LDFLAGS=${LDFLAGS}'"

View File

@@ -0,0 +1,87 @@
---
ipu/Makefile | 2 +-
pxp/Makefile | 2 +-
rng/Makefile | 2 +-
sahara2/Makefile | 2 +-
screenlayer/Makefile | 2 +-
sim/Makefile | 2 +-
vpu/Makefile | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
--- imx-lib-12.09.01.orig/ipu/Makefile
+++ imx-lib-12.09.01/ipu/Makefile
@@ -28,7 +28,7 @@ all install:
endif
$(LIBNAME).so.$(SONAMEVERSION): $(OBJS)
- $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ -lpthread
+ $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ -lpthread $(LDFLAGS)
$(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION)
ln -s $< $@
--- imx-lib-12.09.01.orig/pxp/Makefile
+++ imx-lib-12.09.01/pxp/Makefile
@@ -28,7 +28,7 @@ endif
$(CC) -D$(PLATFORM) $(INCLUDE) -Wall -O2 -fPIC -c $^ -o $@
$(LIBNAME).so.$(SONAMEVERSION): $(OBJ)
- $(CC) -shared -nostartfiles -Wl,-soname,$@ $^ -o $@
+ $(CC) -shared -nostartfiles -Wl,-soname,$@ $^ -o $@ $(LDFLAGS)
$(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION)
ln -s $< $@
--- imx-lib-12.09.01.orig/rng/Makefile
+++ imx-lib-12.09.01/rng/Makefile
@@ -31,7 +31,7 @@ $(LIBNAME).a: $(OBJS)
$(AR) $@ $^
$(LIBNAME).so.$(SONAMEVERSION): $(OBJS)
- $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^
+ $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ $(LDFLAGS)
$(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION)
ln -s $< $@
--- imx-lib-12.09.01.orig/sahara2/Makefile
+++ imx-lib-12.09.01/sahara2/Makefile
@@ -50,7 +50,7 @@ $(LIBNAME).a: $(OBJS)
$(AR) $@ $^
$(LIBNAME).so.$(SONAMEVERSION): $(OBJS)
- $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^
+ $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ $(LDFLAGS)
$(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION)
ln -s $< $@
--- imx-lib-12.09.01.orig/screenlayer/Makefile
+++ imx-lib-12.09.01/screenlayer/Makefile
@@ -24,7 +24,7 @@ all install:
endif
$(LIBNAME).so.$(SONAMEVERSION): $(OBJS)
- $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ -L../ipu -lipu
+ $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ -L../ipu -lipu $(LDFLAGS)
$(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION)
ln -s $< $@
--- imx-lib-12.09.01.orig/sim/Makefile
+++ imx-lib-12.09.01/sim/Makefile
@@ -21,7 +21,7 @@ install:
cp iso7816-3.h $(DEST_DIR)/usr/include
$(LIBNAME).so.$(SONAMEVERSION): $(OBJS)
- $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ -lpthread
+ $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ -lpthread $(LDFLAGS)
$(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION)
ln -s $< $@
--- imx-lib-12.09.01.orig/vpu/Makefile
+++ imx-lib-12.09.01/vpu/Makefile
@@ -36,7 +36,7 @@ endif
$(CC) -D$(PLATFORM) -Wall -O2 -fPIC -c $^ -o $@
$(LIBNAME).so.$(SONAMEVERSION): $(OBJ)
- $(CC) -shared -nostartfiles -Wl,-soname,$@ $^ -o $@
+ $(CC) -shared -nostartfiles -Wl,-soname,$@ $^ -o $@ $(LDFLAGS)
$(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION)
ln -s $< $@