[oe-commits] Chris Larson : autofs: fix ldflags issue, missing debug info, duplicate opt flags.
git version control
git at git.openembedded.org
Thu Aug 27 07:14:19 UTC 2009
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 4e00d90a75f734c1bbf81a26e93e723a85a7329a
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=4e00d90a75f734c1bbf81a26e93e723a85a7329a
Author: Chris Larson <clarson at kergoth.com>
Date: Thu Aug 27 00:09:18 2009 -0700
autofs: fix ldflags issue, missing debug info, duplicate opt flags.
Signed-off-by: Chris Larson <clarson at kergoth.com>
---
.../autofs/autofs-4.1.4/Makefile.rules-cross.patch | 8 ++++----
recipes/autofs/autofs_4.1.4.bb | 6 ++++--
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/recipes/autofs/autofs-4.1.4/Makefile.rules-cross.patch b/recipes/autofs/autofs-4.1.4/Makefile.rules-cross.patch
index d8b3692..dd54dc1 100644
--- a/recipes/autofs/autofs-4.1.4/Makefile.rules-cross.patch
+++ b/recipes/autofs/autofs-4.1.4/Makefile.rules-cross.patch
@@ -6,15 +6,15 @@
ifdef DEBUG
-CFLAGS = -O2 -g -DDEBUG
-LDFLAGS = -g
-+CFLAGS += -O2 -g -DDEBUG
-+LDFLAGS += -g
++CFLAGS ?= -O2 -g -DDEBUG
++LDFLAGS ?= -g
STRIP = :
else
-CFLAGS = -O3 -fomit-frame-pointer -Wall
-LDFLAGS = -s
-STRIP = strip --strip-debug
-+CFLAGS += -O3 -fomit-frame-pointer -Wall
-+LDFLAGS += -s
++CFLAGS ?= -O3 -fomit-frame-pointer -Wall
++LDFLAGS ?= -s
+STRIP = ${TARGET_PREFIX}strip --strip-debug
endif
diff --git a/recipes/autofs/autofs_4.1.4.bb b/recipes/autofs/autofs_4.1.4.bb
index d9863ad..2f998ab 100644
--- a/recipes/autofs/autofs_4.1.4.bb
+++ b/recipes/autofs/autofs_4.1.4.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Kernel based automounter for linux."
SECTION = "base"
LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-${PV}.tar.bz2 \
${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-4.1.4-misc-fixes.patch;patch=1 \
@@ -20,7 +20,9 @@ inherit autotools update-rc.d
INITSCRIPT_NAME = "autofs"
INITSCRIPT_PARAMS = "defaults"
-EXTRA_OEMAKE="TARGET_PREFIX=${TARGET_PREFIX}"
+# FIXME: modules/Makefile has crappy rules that don't obey LDFLAGS
+CFLAGS += "${LDFLAGS}"
+EXTRA_OEMAKE = "STRIP=/bin/true"
PARALLEL_MAKE = ""
do_configure_prepend () {
More information about the Openembedded-commits
mailing list