sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-17 10:40:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

databases/ldb25: drop hardcoded path, pet portlint (+)

Browse source 
* replace /usr/local/libdata/pkgconfig with %%PKGCONFIGDIR%% macro in patch
* switch to USES+= localbase:ldflags

Approved by:	portmgr blanket
This commit is contained in:
Dima Panov 2024-03-13 13:55:36 +03:00
parent 77995e0fa8
commit 473cf29a8f
No known key found for this signature in database
GPG key ID: FB8BA09DD5398F29
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
databases/ldb25/Makefile
View file

@ -22,7 +22,7 @@ TEST_DEPENDS= ${LDB_DEPENDS} \
cmocka>=1.1.3:sysutils/cmocka cmocka>=1.1.3:sysutils/cmocka
RUN_DEPENDS= ${LDB_DEPENDS} 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 CONFLICTS_INSTALL= ldb[0-9][0-9] # include/ldb.h
@ -79,9 +79,6 @@ PLIST_FILES= ${LDB_BINS} \
.include <bsd.port.pre.mk> .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 # 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 # scripts are generated dynamically, suppress errors with lld >= 17 due to these
# undefined symbols. # undefined symbols.

2
databases/ldb25/files/patch-wscript
View file

@ -5,7 +5,7 @@
if not 'PACKAGE_VERSION' in bld.env: if not 'PACKAGE_VERSION' in bld.env:
bld.env.PACKAGE_VERSION = VERSION bld.env.PACKAGE_VERSION = VERSION
- bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' - bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
+ bld.env.PKGCONFIGDIR = '/usr/local/libdata/pkgconfig' + bld.env.PKGCONFIGDIR = '%%PKGCONFIGDIR%%'
private_library = False private_library = False
else: else:
private_library = True private_library = True