RepoMirrors
/
openwrt
mirror of git://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Rosen Penev 2024-11-13 12:33:12 -08:00 committed by Christian Marangi
parent 0000ba6ab8
commit 8f6972df36
No known key found for this signature in database
GPG Key ID: AC001D09ADBFEAD7
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package/system/apk/Makefile
View File

@ -68,9 +68,6 @@ MESON_ARGS += \
$(MESON_COMMON_ARGS) \ $(MESON_COMMON_ARGS) \
-Dcrypto_backend=$(BUILD_VARIANT) -Dcrypto_backend=$(BUILD_VARIANT)
HOST_LDFLAGS += \
-Wl,-rpath $(STAGING_DIR_HOST)/lib
define Package/apk/default/install define Package/apk/default/install
$(INSTALL_DIR) $(1)/lib/apk/db $(INSTALL_DIR) $(1)/lib/apk/db

2
package/system/apk/patches/0001-openwrt-move-layer-db-to-temp-folder.patch
View File

@ -10,7 +10,7 @@ Signed-off-by: Paul Spooren <mail@aparcar.org>
--- a/src/database.c --- a/src/database.c
+++ b/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) { switch (layer) {
case APK_DB_LAYER_ROOT: return "lib/apk/db"; case APK_DB_LAYER_ROOT: return "lib/apk/db";