apk: remove HOST_LDFLAGS hack

No longer needed as upstream respects -Ddefault_library now.

Refreshed patches.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/16945
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

diff --git a/package/system/apk/Makefile b/package/system/apk/Makefile
index f760ce1ec4af65bfba1bb9697e1eb4dce097bc8a..4dbd0f854f37b43e7a74e0bce65f45215a28f39d 100644 (file)
--- a/package/system/apk/Makefile
+++ b/package/system/apk/Makefile
@@ -68,9 +68,6 @@ MESON_ARGS += \
        $(MESON_COMMON_ARGS) \
        -Dcrypto_backend=$(BUILD_VARIANT)
 
-HOST_LDFLAGS += \
-       -Wl,-rpath $(STAGING_DIR_HOST)/lib
-
 define Package/apk/default/install
        $(INSTALL_DIR) $(1)/lib/apk/db
 

diff --git a/package/system/apk/patches/0001-openwrt-move-layer-db-to-temp-folder.patch b/package/system/apk/patches/0001-openwrt-move-layer-db-to-temp-folder.patch
index 850051221221e701f13177c93e6fc5d39242dd63..2b54f47ab77b223d0f5c6365549d9dbae752ce6d 100644 (file)
--- a/package/system/apk/patches/0001-openwrt-move-layer-db-to-temp-folder.patch
+++ b/package/system/apk/patches/0001-openwrt-move-layer-db-to-temp-folder.patch
@@ -10,7 +10,7 @@ Signed-off-by: Paul Spooren <mail@aparcar.org>
 
 --- a/src/database.c
 +++ b/src/database.c
-@@ -1627,7 +1627,7 @@ const char *apk_db_layer_name(int layer)
+@@ -1631,7 +1631,7 @@ const char *apk_db_layer_name(int layer)
  {
        switch (layer) {
        case APK_DB_LAYER_ROOT: return "lib/apk/db";