From: leon.woestenberg@gmail.com
To: openembedded-devel@lists.openembedded.org
Subject: [PATCH] madwifi-ng_r3837: Fix for LDFLAGS / GNU_HASH QA
Date: Sun, 26 Apr 2009 16:35:04 -0700 (PDT) [thread overview]
Message-ID: <49f4efa8.1818d00a.3e97.4971@mx.google.com> (raw)
Submit LDFLAGS variable to make.
Remove the cleaning of LDFLAGS in the binary Makefiles.
Unset LDFLAGS for the kernel modules compile.
Compile tested on powerpc (mpc8313e-rdb).
Signed-off-by: Leon Woestenberg <leon@sidebranch.com>
diff --git a/recipes/madwifi/files/respect-ldflags.patch b/recipes/madwifi/files/respect-ldflags.patch
new file mode 100644
index 0000000..1e5e360
--- /dev/null
+++ b/recipes/madwifi/files/respect-ldflags.patch
@@ -0,0 +1,39 @@
+Index: madwifi-trunk-r3837-20080802/Makefile
+===================================================================
+--- madwifi-trunk-r3837-20080802.orig/Makefile 2009-04-27 00:34:19.000000000 +0200
++++ madwifi-trunk-r3837-20080802/Makefile 2009-04-27 00:34:31.000000000 +0200
+@@ -61,7 +61,7 @@
+ $(MAKE) -C $$i || exit 1; \
+ done
+ else
+- $(MAKE) -C $(KERNELPATH) SUBDIRS=$(shell pwd) modules
++ $(MAKE) -C $(KERNELPATH) LDFLAGS= SUBDIRS=$(shell pwd) modules
+ endif
+
+ $(addprefix $(obj)/, $(obj-y:/=)): $(TOP)/svnversion.h
+Index: madwifi-trunk-r3837-20080802/tools/Makefile
+===================================================================
+--- madwifi-trunk-r3837-20080802.orig/tools/Makefile 2009-04-27 00:34:19.000000000 +0200
++++ madwifi-trunk-r3837-20080802/tools/Makefile 2009-04-27 00:34:36.000000000 +0200
+@@ -55,7 +55,7 @@
+ INCS = -I. -I$(HAL) -I$(TOP) -I$(ATH_HAL)
+ CFLAGS = -g -O2 -Wall
+ ALL_CFLAGS = $(CFLAGS) $(INCS)
+-LDFLAGS =
++#LDFLAGS =
+
+ all: all-subdirs $(PROGRAMS)
+
+Index: madwifi-trunk-r3837-20080802/tools/ath_info/Makefile
+===================================================================
+--- madwifi-trunk-r3837-20080802.orig/tools/ath_info/Makefile 2009-04-27 00:34:19.000000000 +0200
++++ madwifi-trunk-r3837-20080802/tools/ath_info/Makefile 2009-04-27 00:34:40.000000000 +0200
+@@ -5,7 +5,7 @@
+ USER_CROSS_COMPILE ?= $(CROSS_COMPILE)
+ CC = $(USER_CROSS_COMPILE)gcc
+ CFLAGS = -g -O2 -W -Wall
+-LDFLAGS =
++#LDFLAGS =
+ PREFIX = /usr/local
+ BINDIR = $(PREFIX)/bin
+ MANDIR = $(PREFIX)/share/man
diff --git a/recipes/madwifi/madwifi-ng_r.inc b/recipes/madwifi/madwifi-ng_r.inc
index 8fc3065..59f8bc5 100644
--- a/recipes/madwifi/madwifi-ng_r.inc
+++ b/recipes/madwifi/madwifi-ng_r.inc
@@ -4,7 +4,7 @@ PRIORITY = "optional"
LICENSE = "GPL"
RDEPENDS = "kernel (${KERNEL_VERSION})"
DEPENDS = "virtual/kernel"
-PR ="r5"
+PR ="r6"
WACKELF_SRC_URI = ""
WACKELF_SRC_URI_ixp4xx = " file://20-xscale-VFP-wackelf.patch;patch=1"
@@ -21,19 +21,19 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
inherit module-base
-ARCH_efika="powerpc"
ARCH_dht-walnut="ppc"
+ARCH_efika="powerpc"
ARCH_magicbox="ppc"
+ARCH_mpc8313e-rdb="powerpc"
+ARCH_mpc8315e-rdb="powerpc"
ARCH_sequoia="ppc"
-EXTRA_OEMAKE = "LDFLAGS= KERNELPATH=${STAGING_KERNEL_DIR} KERNELRELEASE=${KERNEL_VERSION} TOOLPREFIX=${TARGET_PREFIX}"
+EXTRA_OEMAKE = "KERNELPATH=${STAGING_KERNEL_DIR} KERNELRELEASE=${KERNEL_VERSION} TOOLPREFIX=${TARGET_PREFIX}"
EXTRA_OEMAKE_prepend_ixp4xxle = "TARGET=xscale-le-elf "
EXTRA_OEMAKE_prepend_ixp4xxbe = "TARGET=xscale-be-elf "
-
do_compile() {
- unset LDFLAGS
oe_runmake all
}
@@ -61,3 +61,4 @@ fi
PACKAGES += "${PN}-modules ${PN}-tools"
FILES_${PN}-modules = "/lib/modules/"
FILES_${PN}-tools = "/usr/"
+
diff --git a/recipes/madwifi/madwifi-ng_r3837-20080802.bb b/recipes/madwifi/madwifi-ng_r3837-20080802.bb
index bf14c33..d79ff3c 100644
--- a/recipes/madwifi/madwifi-ng_r3837-20080802.bb
+++ b/recipes/madwifi/madwifi-ng_r3837-20080802.bb
@@ -12,7 +12,9 @@ require madwifi-ng_r.inc
WACKELF_SRC_URI_ixp4xx = " file://20-xscale-VFP-wackelf-v2.patch;patch=1"
WACKELF_SRC_URI_compulab-pxa270 = " file://20-xscale-VFP-wackelf-v2.patch;patch=1"
+SRC_URI += "file://respect-ldflags.patch;patch=1"
+
SRCNAME = "madwifi-trunk"
# PR set after the include, to override what's set in the included file.
-PR = "r1"
+PR = "r2"
next reply other threads:[~2009-04-26 23:40 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-26 23:35 leon.woestenberg [this message]
2009-04-27 1:50 ` [PATCH] madwifi-ng_r3837: Fix for LDFLAGS / GNU_HASH QA Tom Rini
2009-04-27 16:54 ` Leon Woestenberg
2009-04-27 17:30 ` Tom Rini
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=49f4efa8.1818d00a.3e97.4971@mx.google.com \
--to=leon.woestenberg@gmail.com \
--cc=openembedded-devel@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 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.