Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Improved fix for excluding invalid libs from REQUIRES metadata

  • Loading branch information...
commit 77e1890ee8d73821c4f0ab2529fcd8696c00140d 1 parent b7ddf06
@mamash authored
Showing with 2 additions and 6 deletions.
  1. +2 −6 mk/pkgformat/pkg/metadata.mk
View
8 mk/pkgformat/pkg/metadata.mk
@@ -66,7 +66,8 @@ ${_BUILD_INFO_FILE}: plist
ELF) \
libs=`${AWK} '/\/lib.*\.so(\.[0-9]+)*$$/ { print "${DESTDIR}${PREFIX}/" $$0 } END { exit 0 }' ${_PLIST_NOKEYWORDS}`; \
if ${TEST} -n "$$bins" -o -n "$$libs"; then \
- requires=`($$ldd $$bins $$libs 2>/dev/null || ${TRUE}) | ${AWK} '$$2 == "=>" && $$3 ~ "/" { print $$3 }' | ${SORT} -u`; \
+ requires=`(LD_LIBRARY_PATH=${DESTDIR}${PREFIX}/lib $$ldd $$bins $$libs 2>/dev/null || ${TRUE}) |\
+ ${AWK} '$$2 == "=>" && $$3 ~ "/" { print $$3 }' | ${SED} -e 's,${DESTDIR},,' | ${SORT} -u`; \
fi; \
linklibs=`${AWK} '/.*\.so(\.[0-9]+)*$$/ { print "${DESTDIR}${PREFIX}/" $$0 }' ${_PLIST_NOKEYWORDS}`; \
for i in $$linklibs; do \
@@ -93,11 +94,6 @@ ${_BUILD_INFO_FILE}: plist
done | ${SED} -e 's,^PROVIDES=${DESTDIR},PROVIDES=,' \
>> ${.TARGET}.tmp; \
for req in "" $$requires; do \
- stripreq=`${ECHO} $$req | ${AWK} '{gsub(/.*\//, "", $$0); print}'`; \
- for i in "" $$libs; do \
- striplib=`${ECHO} $$i | ${AWK} '{gsub(/.*\//, "", $$0); print}'`; \
- ${TEST} "$${stripreq}" != "$${striplib}" || req=""; \
- done; \
${TEST} "$$req" != "" || continue; \
${ECHO} "REQUIRES=$$req" >> ${.TARGET}.tmp; \
done
Please sign in to comment.
Something went wrong with that request. Please try again.