diff options
| author | Dima Panov <fluffy@FreeBSD.org> | 2024-03-13 10:55:36 +0000 |
|---|---|---|
| committer | Dima Panov <fluffy@FreeBSD.org> | 2024-03-13 10:57:54 +0000 |
| commit | 473cf29a8f51a5fdb042ae81d711c08116bc68d0 (patch) | |
| tree | bc087e901cd3917232c76a128a450b568f0914e4 | |
| parent | 77995e0fa8b5093983b3c4fcdd01a7db55454e12 (diff) | |
| download | ports-473cf29a8f51a5fdb042ae81d711c08116bc68d0.tar.gz ports-473cf29a8f51a5fdb042ae81d711c08116bc68d0.zip | |
databases/ldb25: drop hardcoded path, pet portlint (+)
* replace /usr/local/libdata/pkgconfig with %%PKGCONFIGDIR%% macro in patch
* switch to USES+= localbase:ldflags
Approved by: portmgr blanket
| -rw-r--r-- | databases/ldb25/Makefile | 5 | ||||
| -rw-r--r-- | databases/ldb25/files/patch-wscript | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/databases/ldb25/Makefile b/databases/ldb25/Makefile index 69df3c7b72cf..0729907ac55d 100644 --- a/databases/ldb25/Makefile +++ b/databases/ldb25/Makefile @@ -22,7 +22,7 @@ TEST_DEPENDS= ${LDB_DEPENDS} \ cmocka>=1.1.3:sysutils/cmocka RUN_DEPENDS= ${LDB_DEPENDS} -USES= compiler ldap pkgconfig waf +USES= compiler ldap localbase:ldflags pkgconfig waf CONFLICTS_INSTALL= ldb[0-9][0-9] # include/ldb.h @@ -79,9 +79,6 @@ PLIST_FILES= ${LDB_BINS} \ .include <bsd.port.pre.mk> -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - # Some symbols in ldb's linker version scripts are not defined, but since the # scripts are generated dynamically, suppress errors with lld >= 17 due to these # undefined symbols. diff --git a/databases/ldb25/files/patch-wscript b/databases/ldb25/files/patch-wscript index ff413e81afff..81600dc38d83 100644 --- a/databases/ldb25/files/patch-wscript +++ b/databases/ldb25/files/patch-wscript @@ -5,7 +5,7 @@ if not 'PACKAGE_VERSION' in bld.env: bld.env.PACKAGE_VERSION = VERSION - bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' -+ bld.env.PKGCONFIGDIR = '/usr/local/libdata/pkgconfig' ++ bld.env.PKGCONFIGDIR = '%%PKGCONFIGDIR%%' private_library = False else: private_library = True |