diff options
| author | jlam <jlam@pkgsrc.org> | 2007-08-23 17:31:46 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2007-08-23 17:31:46 +0000 |
| commit | 711d838dc01ff8af1c1845624c68511ffa08dcb9 (patch) | |
| tree | de70b5716d33e7038dd6deb7d548c85917f74a69 /emulators | |
| parent | a10d678f1f5dcdbb14063a1ca56fbdb23ef08797 (diff) | |
| download | pkgsrc-711d838dc01ff8af1c1845624c68511ffa08dcb9.tar.gz | |
Back out previous and solve this in another way that doesn't involve
a hokey new emulator-opsys.mk file.
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/compat_netbsd/Makefile.common | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/emulators/compat_netbsd/Makefile.common b/emulators/compat_netbsd/Makefile.common index b9e690a9b6f..762c8a2cd57 100644 --- a/emulators/compat_netbsd/Makefile.common +++ b/emulators/compat_netbsd/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2007/08/23 15:59:33 jlam Exp $ +# $NetBSD: Makefile.common,v 1.3 2007/08/23 17:31:46 jlam Exp $ # # Common infrastructure for NetBSD compat* packages. # @@ -43,8 +43,6 @@ BUILD_DIRS= # empty MAKE_DIRS+= ${EMULDIR} ELF_SYMLINKS_DATA= ${WRKDIR}/.symlinks-data -.include "../../mk/emulator/emulator-opsys.mk" - # # PLISTs are composed from the following bits, in order: # @@ -62,6 +60,19 @@ PLIST_SRC+= ${PKGDIR}/PLIST.${EMUL_EXEC_FMT} PLIST_SRC+= ${PKGDIR}/PLIST .endif +# Set NATIVE_EXEC_FMT and EMUL_EXEC_FMT appropriately. Normally, these +# are set by mk/emulator.mk, included in bsd.pkg.mk, but this happens +# too late for us here. +# +# Directly set NATIVE_EXEC_FMT and include the correct emulator.mk file +# to define EMUL_EXEC_FMT. +# +NATIVE_EXEC_FMT= ${_NATIVE_EXEC_FMT_cmd:sh} +_NATIVE_EXEC_FMT_cmd= sh ${.CURDIR}/../../mk/scripts/shlib-type \ + ${_OPSYS_SHLIB_TYPE:Q} ${MAKE:Q} + +.include "${PKGSRCDIR}/emulators/${DISTNAME:S/-*//}/emulator.mk" + # # Different combinations of the native executable format and the emulated # executable format require different ways of making the installed shared |