diff options
| author | linimon <linimon@FreeBSD.org> | 2006-07-19 08:02:52 +0800 |
|---|---|---|
| committer | linimon <linimon@FreeBSD.org> | 2006-07-19 08:02:52 +0800 |
| commit | 4b616313f1ae67d49ae12c65d31d705b56bfec52 (patch) | |
| tree | 52a8392be66f23976b7eb7ee66ac836227e43acd | |
| parent | 4b3c8f01b38c5f924f9d55b055c54ee908e9619f (diff) | |
| download | freebsd-ports-gnome-4b616313f1ae67d49ae12c65d31d705b56bfec52.tar.gz freebsd-ports-gnome-4b616313f1ae67d49ae12c65d31d705b56bfec52.tar.zst freebsd-ports-gnome-4b616313f1ae67d49ae12c65d31d705b56bfec52.zip | |
Bring this up to date with ports/Mk/bsd.port.mk 1.538. Note that ports/98565
was forgotten on the test run yet again.
| -rw-r--r-- | devel/portmk/Mk/bsd.port.mk | 25 | ||||
| -rw-r--r-- | ports-mgmt/portmk/Mk/bsd.port.mk | 25 |
2 files changed, 48 insertions, 2 deletions
diff --git a/devel/portmk/Mk/bsd.port.mk b/devel/portmk/Mk/bsd.port.mk index 0ba2ec4c6748..f9e5d0135374 100644 --- a/devel/portmk/Mk/bsd.port.mk +++ b/devel/portmk/Mk/bsd.port.mk @@ -1147,6 +1147,29 @@ IGNORE= you have to use i386 (or compatible) platform to use this port. .endif .endif +# Check the compatibility layer for amd64/ia64 + +.if ${ARCH} == "amd64" || ${ARCH} =="ia64" +.if exists(/usr/lib32) +HAVE_COMPAT_IA32_LIBS?= YES +.endif +.if !defined(HAVE_COMPAT_IA32_KERN) +HAVE_COMPAT_IA32_KERN!= if ${SYSCTL} -a compat.ia32.maxvmem >/dev/null 2>&1; then echo YES; fi +.endif +.endif + +.if defined(IA32_BINARY_PORT) && ${ARCH} != "i386" +.if ${ARCH} == "amd64" || ${ARCH} == "ia64" +.if !defined(HAVE_COMPAT_IA32_KERN) +IGNORE= you need a kernel with compiled-in IA32 compatibility to use this port. +.elif !defined(HAVE_COMPAT_IA32_LIBS) +IGNORE= you need the 32-bit libraries installed under /usr/lib32 to use this port. +.endif +.else +IGNORE= you have to use i386 (or compatible) platform to use this port. +.endif +.endif + # If they exist, include Makefile.inc, then architecture/operating # system specific Makefiles, then local Makefile.local. @@ -3863,7 +3886,7 @@ install-ldconfig-file: .endif @${ECHO_MSG} "===> Installing 32-bit ldconfig configuration file" .if defined(NO_LDCONFIG_MTREE) - @${MKDIR} ${LDCONFIG_32DIR} + @${MKDIR} ${PREFIX}/${LDCONFIG_32DIR} .endif @${ECHO_CMD} ${USE_LDCONFIG32} | ${TR} ' ' '\n' \ > ${PREFIX}/${LDCONFIG32_DIR}/${UNIQUENAME} diff --git a/ports-mgmt/portmk/Mk/bsd.port.mk b/ports-mgmt/portmk/Mk/bsd.port.mk index 0ba2ec4c6748..f9e5d0135374 100644 --- a/ports-mgmt/portmk/Mk/bsd.port.mk +++ b/ports-mgmt/portmk/Mk/bsd.port.mk @@ -1147,6 +1147,29 @@ IGNORE= you have to use i386 (or compatible) platform to use this port. .endif .endif +# Check the compatibility layer for amd64/ia64 + +.if ${ARCH} == "amd64" || ${ARCH} =="ia64" +.if exists(/usr/lib32) +HAVE_COMPAT_IA32_LIBS?= YES +.endif +.if !defined(HAVE_COMPAT_IA32_KERN) +HAVE_COMPAT_IA32_KERN!= if ${SYSCTL} -a compat.ia32.maxvmem >/dev/null 2>&1; then echo YES; fi +.endif +.endif + +.if defined(IA32_BINARY_PORT) && ${ARCH} != "i386" +.if ${ARCH} == "amd64" || ${ARCH} == "ia64" +.if !defined(HAVE_COMPAT_IA32_KERN) +IGNORE= you need a kernel with compiled-in IA32 compatibility to use this port. +.elif !defined(HAVE_COMPAT_IA32_LIBS) +IGNORE= you need the 32-bit libraries installed under /usr/lib32 to use this port. +.endif +.else +IGNORE= you have to use i386 (or compatible) platform to use this port. +.endif +.endif + # If they exist, include Makefile.inc, then architecture/operating # system specific Makefiles, then local Makefile.local. @@ -3863,7 +3886,7 @@ install-ldconfig-file: .endif @${ECHO_MSG} "===> Installing 32-bit ldconfig configuration file" .if defined(NO_LDCONFIG_MTREE) - @${MKDIR} ${LDCONFIG_32DIR} + @${MKDIR} ${PREFIX}/${LDCONFIG_32DIR} .endif @${ECHO_CMD} ${USE_LDCONFIG32} | ${TR} ' ' '\n' \ > ${PREFIX}/${LDCONFIG32_DIR}/${UNIQUENAME} |