summaryrefslogtreecommitdiff
path: root/package/ulogd
diff options
context:
space:
mode:
Diffstat (limited to 'package/ulogd')
-rw-r--r--package/ulogd/Makefile9
-rw-r--r--package/ulogd/patches/patch-ltmain_sh11
2 files changed, 12 insertions, 8 deletions
diff --git a/package/ulogd/Makefile b/package/ulogd/Makefile
index e1f4d0dc5..3010e7a92 100644
--- a/package/ulogd/Makefile
+++ b/package/ulogd/Makefile
@@ -34,13 +34,6 @@ $(eval $(call PKG_template,ULOGD_MOD_PGSQL,ulogd-mod-pgsql,${PKG_VERSION}-${PKG_
$(eval $(call PKG_template,ULOGD_MOD_SQLITE,ulogd-mod-sqlite,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,ULOGD_MOD_EXTRA,ulogd-mod-extra,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-SUB_INSTALLS-y:=
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_ULOGD_MOD_MYSQL}+= ulogd-mod-mysql-install
-SUB_INSTALLS-${ADK_PACKAGE_ULOGD_MOD_PGSQL}+= ulogd-mod-pgsql-install
-SUB_INSTALLS-${ADK_PACKAGE_ULOGD_MOD_SQLITE}+= ulogd-mod-sqlite-install
-SUB_INSTALLS-${ADK_PACKAGE_ULOGD_MOD_EXTRA}+= ulogd-mod-extra-install
-
TCFLAGS+= -fPIC
ifneq (${ADK_PACKAGE_ULOGD_MOD_MYSQL},)
@@ -55,7 +48,7 @@ ifneq (${ADK_PACKAGE_ULOGD_MOD_SQLITE},)
CONFIGURE_ARGS+= --with-sqlite3=${STAGING_TARGET_DIR}/usr
endif
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
+post-install:
${INSTALL_DIR} ${IDIR_ULOGD}/usr/sbin ${IDIR_ULOGD}/usr/lib/ulogd/
${INSTALL_BIN} ${WRKINST}/usr/lib/ulogd/ulogd_raw2packet_BASE.so \
${IDIR_ULOGD}/usr/lib/ulogd/
diff --git a/package/ulogd/patches/patch-ltmain_sh b/package/ulogd/patches/patch-ltmain_sh
new file mode 100644
index 000000000..d5b6fafd8
--- /dev/null
+++ b/package/ulogd/patches/patch-ltmain_sh
@@ -0,0 +1,11 @@
+--- ulogd-2.0.0beta4.orig/ltmain.sh 2010-07-16 17:53:39.000000000 +0200
++++ ulogd-2.0.0beta4/ltmain.sh 2011-01-17 16:15:25.000000000 +0100
+@@ -4765,7 +4765,7 @@ func_mode_link ()
+ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+ # @file GCC response files
+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
+ func_quote_for_eval "$arg"
+ arg="$func_quote_for_eval_result"
+ func_append compile_command " $arg"