diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-13 04:53:20 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-13 04:53:20 +0200 |
| commit | 92623154c7b3edde7bf4812530e4db9de2779283 (patch) | |
| tree | 4d9a5df1ec44939ce4731af80a56471643eaf815 /package/dbus | |
| parent | 4090002fc466e4319c95ab214c3f92ecc7b59184 (diff) | |
| parent | 933e74c07231e815bbfd9ed90073308eaf253a00 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/mpfr/Makefile
Diffstat (limited to 'package/dbus')
| -rw-r--r-- | package/dbus/Makefile | 2 | ||||
| -rw-r--r-- | package/dbus/patches/patch-configure | 21 |
2 files changed, 23 insertions, 0 deletions
diff --git a/package/dbus/Makefile b/package/dbus/Makefile index 1835e5a56..a86beb442 100644 --- a/package/dbus/Makefile +++ b/package/dbus/Makefile @@ -27,11 +27,13 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,DBUS_DEV,dbus-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DBUS_DEV},${PKGSC_DBUS_DEV},${PKG_OPTS})) +TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ARGS+= --disable-tests \ --disable-abstract-sockets \ --without-x \ --enable-checks \ --with-xml=expat \ + --with-session-socket-dir=/var/tmp \ --disable-dnotify \ --disable-kqueue \ --disable-xml-docs \ diff --git a/package/dbus/patches/patch-configure b/package/dbus/patches/patch-configure new file mode 100644 index 000000000..e5bce5132 --- /dev/null +++ b/package/dbus/patches/patch-configure @@ -0,0 +1,21 @@ +--- dbus-1.4.6.orig/configure 2011-02-17 21:06:57.000000000 +0100 ++++ dbus-1.4.6/configure 2011-04-13 04:47:38.000000000 +0200 +@@ -19608,18 +19608,6 @@ if test "x$GCC" = "xyes"; then + ;; + esac + +- case " $CFLAGS " in +- *[\ \ ]-fPIE[\ \ ]*) ;; +- *) if test x$dbus_win = xno && 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 + |