summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package/aircrack-ng/Makefile2
-rw-r--r--package/arpd/Makefile4
-rw-r--r--package/bluez-firmware/Makefile2
-rw-r--r--package/ca-certificates/Makefile2
-rw-r--r--package/dansguardian/Makefile2
-rw-r--r--package/dhcp-forwarder/Makefile3
-rw-r--r--package/libgcrypt/Makefile10
-rw-r--r--package/lighttpd/Makefile2
-rw-r--r--package/pam/Makefile8
-rw-r--r--package/postgresql/Makefile5
-rw-r--r--package/postgresql/files/pg_config19
-rw-r--r--package/updatedd/Makefile2
-rw-r--r--package/wolfssl/Makefile4
13 files changed, 41 insertions, 24 deletions
diff --git a/package/aircrack-ng/Makefile b/package/aircrack-ng/Makefile
index cd28ee7a2..a0bf5a984 100644
--- a/package/aircrack-ng/Makefile
+++ b/package/aircrack-ng/Makefile
@@ -28,7 +28,7 @@ XAKE_FLAGS+= CC="$(TARGET_CC)" TOOL_PREFIX="$(TARGET_CROSS)" \
CFLAGS="$(TARGET_CFLAGS) -Wall" \
OSNAME="Linux" prefix="/usr"
-post-install:
+aircrack-ng-install:
$(INSTALL_DIR) $(IDIR_AIRCRACK_NG)/usr/bin
$(INSTALL_DIR) $(IDIR_AIRCRACK_NG)/usr/sbin
$(INSTALL_BIN) $(WRKINST)/usr/bin/aircrack-ng \
diff --git a/package/arpd/Makefile b/package/arpd/Makefile
index 8fd42f7cd..9e556d80a 100644
--- a/package/arpd/Makefile
+++ b/package/arpd/Makefile
@@ -19,7 +19,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}
include ${ADK_TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,ARPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ARPD,arpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --with-libdnet=${STAGING_TARGET_DIR}/usr \
--with-libevent=${STAGING_TARGET_DIR}/usr \
@@ -28,7 +28,7 @@ MAKE_FLAGS+= CFLAGS="${TARGET_CFLAGS}" \
INCLS="-I. ${TARGET_CPPFLAGS}" \
LIBS="-lpcap -ldnet -levent"
-post-install:
+arpd-install:
${INSTALL_DIR} ${IDIR_ARPD}/usr/sbin
${INSTALL_BIN} ${WRKBUILD}/arpd ${IDIR_ARPD}/usr/sbin/
diff --git a/package/bluez-firmware/Makefile b/package/bluez-firmware/Makefile
index 9fae71e91..ac66abe74 100644
--- a/package/bluez-firmware/Makefile
+++ b/package/bluez-firmware/Makefile
@@ -21,7 +21,7 @@ $(eval $(call PKG_template,BLUEZ_FIRMWARE,bluez-firmware,${PKG_VERSION}-${PKG_RE
CONFIGURE_ARGS+= --libdir=/lib
-post-install:
+bluez-firmware-install:
${INSTALL_DIR} ${IDIR_BLUEZ_FIRMWARE}/lib/firmware
${CP} ${WRKINST}/lib/firmware/BCM* \
${IDIR_BLUEZ_FIRMWARE}/lib/firmware
diff --git a/package/ca-certificates/Makefile b/package/ca-certificates/Makefile
index e53290628..e33490ef1 100644
--- a/package/ca-certificates/Makefile
+++ b/package/ca-certificates/Makefile
@@ -24,7 +24,7 @@ $(eval $(call PKG_template,CA_CERTIFICATES,ca-certificates,${PKG_VERSION}-${PKG_
CONFIG_STYLE:= manual
-post-install:
+ca-certificates-install:
ifeq (${ADK_PACKAGE_CA_CERTIFICATES_SMALL},y)
${INSTALL_DIR} ${IDIR_CA_CERTIFICATES}/etc/ssl
${INSTALL_DATA} ./extra/cert.pem ${IDIR_CA_CERTIFICATES}/etc/ssl/
diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile
index 94d33ec8c..1d80f4097 100644
--- a/package/dansguardian/Makefile
+++ b/package/dansguardian/Makefile
@@ -38,7 +38,7 @@ CONFIGURE_ARGS+= --enable-orig-ip \
--with-proxyuser=proxy \
--with-proxygroup=proxy
-post-install:
+dansguardian-install:
${INSTALL_DIR} ${IDIR_DANSGUARDIAN}/usr/sbin \
${IDIR_DANSGUARDIAN}/etc/dansguardian \
${IDIR_DANSGUARDIAN}/usr/share/dansguardian/languages/ukenglish
diff --git a/package/dhcp-forwarder/Makefile b/package/dhcp-forwarder/Makefile
index 3d1fff97b..ef7b77431 100644
--- a/package/dhcp-forwarder/Makefile
+++ b/package/dhcp-forwarder/Makefile
@@ -17,9 +17,10 @@ include ${ADK_TOPDIR}/mk/package.mk
$(eval $(call PKG_template,DHCP_FORWARDER,dhcp-forwarder,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ARGS+= --disable-dietlibc
+CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull=yes
XAKE_FLAGS+= cfg_filename="/etc/dhcp-fwd.conf"
-post-install:
+dhcp-forwarder-install:
${INSTALL_DIR} ${IDIR_DHCP_FORWARDER}/usr/sbin \
${IDIR_DHCP_FORWARDER}/etc
${INSTALL_DATA} ${WRKBUILD}/contrib/dhcp-fwd.conf \
diff --git a/package/libgcrypt/Makefile b/package/libgcrypt/Makefile
index d308952fa..c5fb7ab8a 100644
--- a/package/libgcrypt/Makefile
+++ b/package/libgcrypt/Makefile
@@ -24,15 +24,15 @@ $(eval $(call PKG_template,LIBGCRYPT,libgcrypt,$(PKG_VERSION)-$(PKG_RELEASE),$(P
CONFIGURE_ARGS+= --disable-asm \
--with-gpg-error-prefix="$(STAGING_TARGET_DIR)/usr"
+libgcrypt-install:
+ $(INSTALL_DIR) $(IDIR_LIBGCRYPT)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libgcrypt.so* \
+ $(IDIR_LIBGCRYPT)/usr/lib
+
post-install:
# provides own automake macros
$(INSTALL_DIR) $(STAGING_HOST_DIR)/usr/share/aclocal
$(CP) $(WRKINST)/usr/share/aclocal/libgcrypt.m4 \
$(STAGING_HOST_DIR)/usr/share/aclocal
-libgcrypt-install:
- $(INSTALL_DIR) $(IDIR_LIBGCRYPT)/usr/lib
- $(CP) $(WRKINST)/usr/lib/libgcrypt.so* \
- $(IDIR_LIBGCRYPT)/usr/lib
-
include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile
index 883da9eb4..9de638a02 100644
--- a/package/lighttpd/Makefile
+++ b/package/lighttpd/Makefile
@@ -146,7 +146,7 @@ else
CONFIGURE_ARGS+= --without-openssl
endif
-post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
+lighttpd-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
${INSTALL_DIR} $(IDIR_LIGHTTPD)/etc/lighttpd/conf.d
${INSTALL_DATA} ./files/lighttpd.conf $(IDIR_LIGHTTPD)/etc/lighttpd
${INSTALL_DATA} ./files/modules.conf $(IDIR_LIGHTTPD)/etc/lighttpd
diff --git a/package/pam/Makefile b/package/pam/Makefile
index be3543b96..3c9089e76 100644
--- a/package/pam/Makefile
+++ b/package/pam/Makefile
@@ -15,8 +15,6 @@ PKG_SITES:= http://www.linux-pam.org/library/
PKG_OPTS:= dev
PKG_BB:= 1
-PKG_CFLINE_PAM:= depends on !ADK_TARGET_USE_STATIC_LIBS
-
DISTFILES:= Linux-PAM-$(PKG_VERSION).tar.gz
WRKDIST= ${WRKDIR}/Linux-PAM-${PKG_VERSION}
@@ -29,12 +27,6 @@ CONFIGURE_ARGS+= --disable-nis \
--disable-regenerate-docu \
--enable-db=no
-post-install:
-ifeq ($(ADK_TARGET_USE_STATIC_LIBS),)
- # /lib is not automatically installed to staging area
- $(CP) $(WRKINST)/lib/libpam*.so* $(STAGING_TARGET_DIR)/usr/lib
-endif
-
pam-install:
$(INSTALL_DIR) $(IDIR_PAM)/etc/security
$(CP) $(WRKINST)/etc/security/* $(IDIR_PAM)/etc/security
diff --git a/package/postgresql/Makefile b/package/postgresql/Makefile
index b28d4e85e..f60f7d8a7 100644
--- a/package/postgresql/Makefile
+++ b/package/postgresql/Makefile
@@ -36,4 +36,9 @@ libpq-install:
$(INSTALL_DIR) $(IDIR_LIBPQ)/usr/lib
$(CP) $(WRKINST)/usr/lib/libpq.so* $(IDIR_LIBPQ)/usr/lib
+post-install:
+ PATH='$(HOST_PATH)' sed -e "s#@@STAGING_TARGET_DIR@@#$(STAGING_TARGET_DIR)#" \
+ ./files/pg_config > $(STAGING_HOST_DIR)/usr/bin/pg_config
+ -rm $(STAGING_TARGET_DIR)/usr/bin/pg_config
+
include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/postgresql/files/pg_config b/package/postgresql/files/pg_config
new file mode 100644
index 000000000..0d82c24a1
--- /dev/null
+++ b/package/postgresql/files/pg_config
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+#
+# Minimal pg_config implementation as replacement for the native pg_config application
+# Only implements --includedir and --libdir
+#
+
+prefix=@@STAGING_TARGET_DIR@@/usr
+
+case "$1" in
+ --includedir)
+ echo "$prefix/include"
+ ;;
+ --libdir)
+ echo "$prefix/lib"
+ ;;
+ *)
+ echo "Usage: $0 {--includedir|--libdir}"
+esac
diff --git a/package/updatedd/Makefile b/package/updatedd/Makefile
index 765e1cfd0..72e4f73bb 100644
--- a/package/updatedd/Makefile
+++ b/package/updatedd/Makefile
@@ -46,7 +46,7 @@ $(eval $(call PKG_template,UPDATEDD_MOD_TZO,updatedd-mod-tzo,${PKG_VERSION}-${PK
CONFIGURE_ARGS+= ac_cv_lib_nsl_gethostbyname=no
-post-install:
+updatedd-install:
${INSTALL_DIR} ${IDIR_UPDATEDD}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/updatedd ${IDIR_UPDATEDD}/usr/bin/
${INSTALL_DIR} ${IDIR_UPDATEDD}/usr/lib/updatedd
diff --git a/package/wolfssl/Makefile b/package/wolfssl/Makefile
index 23ef53510..456f922fa 100644
--- a/package/wolfssl/Makefile
+++ b/package/wolfssl/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= wolfssl
-PKG_VERSION:= 3.4.0
+PKG_VERSION:= 3.4.6
PKG_RELEASE:= 1
-PKG_HASH:= 22622295ef42e9e37341009e4b134165fb06db53cbc8509dbeb822b9dd613c45
+PKG_HASH:= 267a75ff2b81ac793d8170904c97635d74bed1c353162622eb66d8e7fa6260fa
PKG_DESCR:= portable embedded ssl library
PKG_SECTION:= libs/crypto
PKG_URL:= http://www.wolfssl.com
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 23:31:26 +0000