diff options
| author | Rosen Penev | 2024-11-13 20:33:12 +0000 |
|---|---|---|
| committer | Christian Marangi | 2024-11-16 16:24:33 +0000 |
| commit | 8f6972df36a520738083dc48eac69b778fbc814e (patch) | |
| tree | 60b00d6e0cf9d22377c72c9b5962d6929643ad47 | |
| parent | 0000ba6ab8062f965d8fed240b76d36f9a493b55 (diff) | |
| download | openwrt-8f6972df36a520738083dc48eac69b778fbc814e.tar.gz | |
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>
| -rw-r--r-- | package/system/apk/Makefile | 3 | ||||
| -rw-r--r-- | package/system/apk/patches/0001-openwrt-move-layer-db-to-temp-folder.patch | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/package/system/apk/Makefile b/package/system/apk/Makefile index f760ce1ec4..4dbd0f854f 100644 --- 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 8500512212..2b54f47ab7 100644 --- 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"; |