kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rearrange some of the logic to consolidate the code that is a.out-specific.

Browse source 
Also name the replace-libnames-configure as part of ${_CONFIGURE_PREREQ}
instead of as a prerequisite to pre-configure.  This is needed so that the
replacement occurs _after_ pre-configure target is run, which may call
autoconf/automake to regenerate the configure scripts.  Before this change,
the replacement would be overwritten when the configure scripts were
regenerated.  This should fix a problem first noticed by Alistair Crooks
<agc@netbsd.org> in the net/mtr package.
This commit is contained in:
jlam 2001-10-24 19:46:45 +00:00
parent 51436ad116
commit e44bb6e882
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
mk/bsd.buildlink.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: bsd.buildlink.mk,v 1.45 2001/10/24 19:01:00 jlam Exp $
# $NetBSD: bsd.buildlink.mk,v 1.46 2001/10/24 19:46:45 jlam Exp $
#
# This Makefile fragment is included by package buildlink.mk files. This
# file does the following things:
@ -245,14 +245,17 @@ MAKEFILE_PATTERNS+= *.mk
REPLACE_LIBNAME_PATTERNS+= ${MAKEFILE_PATTERNS}
_REPLACE_LIBNAME_PATTERNS_FIND= \
${REPLACE_LIBNAME_PATTERNS:S/$/!/:S/^/-o -name !/:S/!/"/g:S/-o//1}
_REPLACE_LIBNAME_CONFIGURE_PATTERNS_FIND= \
-name "${CONFIGURE_SCRIPT:T}"
REPLACE_LIBNAMES_CONFIGURE+= \
`cd ${WRKSRC}; ${FIND} . ${_REPLACE_LIBNAME_CONFIGURE_PATTERNS_FIND} | ${SED} -e 's|^\./||' | ${SORT}`
REPLACE_LIBNAMES+= \
`cd ${WRKSRC}; ${FIND} . ${_REPLACE_LIBNAME_PATTERNS_FIND} | ${SED} -e 's|^\./||' | ${SORT}`
.endif
.if defined(REPLACE_LIBNAMES) || defined(REPLACE_LIBNAME_PATTERNS)
.if defined(HAS_CONFIGURE) || defined(GNU_CONFIGURE)
pre-configure: replace-libnames-configure
_CONFIGURE_PREREQ+= replace-libnames-configure
# Fix linking on a.out platforms in configure scripts by changing library
# references to the true library names.
@ -261,11 +264,11 @@ replace-libnames-configure:
${_PKG_SILENT}${_PKG_DEBUG} \
cookie=${BUILDLINK_DIR}/.replace_libnames_configure_done; \
if [ ! -f $${cookie} ]; then \
replace_files="${CONFIGURE_SCRIPT}"; \
replace_files="${REPLACE_LIBNAMES_CONFIGURE}"; \
message="Fixing library name references in configure scripts:"; \
${_REPLACE_LIBNAMES_SCRIPT}; \
fi
.endif # HAS_CONFIGURE
.endif
post-configure: replace-libnames-makefiles
@ -280,7 +283,7 @@ replace-libnames-makefiles:
message="Fixing library name references in Makefiles:"; \
${_REPLACE_LIBNAMES_SCRIPT}; \
fi
.endif # REPLACE_LIBNAMES
.endif # a.out
REPLACE_RPATH_PATTERNS+= ${MAKEFILE_PATTERNS}
_REPLACE_RPATH_PATTERNS_FIND= \