diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-01 19:45:20 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-01 19:45:20 +0100 |
commit | 269e98c93f1bff77dc33701f1e5e8615a031ec0b (patch) | |
tree | d6e35e6da4bc19f657ac07ff8447ec065d85a4aa /package/dbus | |
parent | d1b6ea47f57cbcac8543a4dba976e13e3bc2e985 (diff) | |
parent | 2a8b0c42a074556bd489ef88a2b788f84ff6cf1e (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/dbus')
-rw-r--r-- | package/dbus/Makefile | 2 | ||||
-rw-r--r-- | package/dbus/patches/patch-configure | 22 |
2 files changed, 23 insertions, 1 deletions
diff --git a/package/dbus/Makefile b/package/dbus/Makefile index 6bb63c302..4dcb4067b 100644 --- a/package/dbus/Makefile +++ b/package/dbus/Makefile @@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= dbus PKG_VERSION:= 1.2.16 PKG_RELEASE:= 1 -PKG_BUILDDEP+= expat PKG_MD5SUM:= c7a47b851ebe02f6726b65b78d1b730b PKG_DESCR:= DBUS library PKG_SECTION:= net PKG_DEPENDS:= libexpat +PKG_BUILDDEP+= expat PKG_URL:= http://dbus.freedesktop.org PKG_SITES:= http://dbus.freedesktop.org/releases/dbus/ ifeq ($(ADK_STATIC),y) diff --git a/package/dbus/patches/patch-configure b/package/dbus/patches/patch-configure new file mode 100644 index 000000000..f33a192a9 --- /dev/null +++ b/package/dbus/patches/patch-configure @@ -0,0 +1,22 @@ +--- dbus-1.2.16.orig/configure 2009-07-14 21:43:08.000000000 +0200 ++++ dbus-1.2.16/configure 2010-01-15 19:03:24.000000000 +0100 +@@ -25213,19 +25213,6 @@ if test "x$GCC" = "xyes"; then + ;; + esac + +- case " $CFLAGS " in +- *[\ \ ]-fPIE[\ \ ]*) ;; +- *) if cc_supports_flag -fPIE; then +- PIE_CFLAGS="-fPIE" +- if ld_supports_flag -z,relro; then +- PIE_LDFLAGS="-pie -Wl,-z,relro" +- else +- PIE_LDFLAGS="-pie" +- fi +- fi +- ;; +- esac +- + ### Disabled warnings, and compiler flag overrides + + # Let's just ignore unused for now |