diff options
| author | nwhitehorn <nwhitehorn@FreeBSD.org> | 2011-10-03 20:46:36 +0000 |
|---|---|---|
| committer | nwhitehorn <nwhitehorn@FreeBSD.org> | 2011-10-03 20:46:36 +0000 |
| commit | d0edacc828bd8ebfec52659abb65d71839c7fbb6 (patch) | |
| tree | 96143983a527b9cd07aa93ce48052277edfe7c6e /ObsoleteFiles.inc | |
| parent | 949394e8e0224cfa99b2f84509def2a178ec0cf4 (diff) | |
| download | FreeBSD-src-d0edacc828bd8ebfec52659abb65d71839c7fbb6.zip FreeBSD-src-d0edacc828bd8ebfec52659abb65d71839c7fbb6.tar.gz | |
Fix a number of platform problems in this file (mostly assuming that only
amd64 has lib32).
Diffstat (limited to 'ObsoleteFiles.inc')
| -rw-r--r-- | ObsoleteFiles.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 547edbb..e762753 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -56,7 +56,7 @@ OLD_LIBS+=usr/lib/libdwarf.so.2 OLD_LIBS+=usr/lib/libopie.so.6 OLD_LIBS+=usr/lib/librtld_db.so.1 OLD_LIBS+=usr/lib/libtacplus.so.4 -.if ${TARGET_ARCH} == "amd64" +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" OLD_LIBS+=usr/lib32/libcam.so.5 OLD_LIBS+=usr/lib32/libpcap.so.7 OLD_LIBS+=usr/lib32/libufs.so.5 @@ -94,7 +94,7 @@ OLD_FILES+=usr/lib/libpkg.a OLD_FILES+=usr/lib/libpkg.so OLD_LIBS+=usr/lib/libpkg.so.0 OLD_FILES+=usr/lib/libpkg_p.a -.if ${TARGET_ARCH} == "amd64" +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" OLD_FILES+=usr/lib32/libpkg.a OLD_FILES+=usr/lib32/libpkg.so OLD_LIBS+=usr/lib32/libpkg.so.0 @@ -102,7 +102,7 @@ OLD_FILES+=usr/lib32/libpkg_p.a .endif # 20110517: libsbuf version bump OLD_LIBS+=lib/libsbuf.so.5 -.if ${TARGET_ARCH} == "amd64" +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" OLD_LIBS+=usr/lib32/libsbuf.so.5 .endif # 20110502: new clang import which bumps version from 2.9 to 3.0 @@ -133,7 +133,7 @@ OLD_FILES+=usr/lib/libobjc_p.a OLD_FILES+=usr/libexec/cc1obj OLD_LIBS+=usr/lib/libobjc.so.4 OLD_DIRS+=usr/include/objc -.if ${TARGET_ARCH} == "amd64" +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" OLD_FILES+=usr/lib32/libobjc.a OLD_FILES+=usr/lib32/libobjc.so OLD_FILES+=usr/lib32/libobjc_p.a @@ -260,7 +260,7 @@ OLD_FILES+=usr/include/machine/intr.h .endif # 20100514: library version bump for versioned symbols for liblzma OLD_LIBS+=usr/lib/liblzma.so.0 -.if ${TARGET_ARCH} == "amd64" +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" OLD_LIBS+=usr/lib32/liblzma.so.0 .endif # 20100511: move GCC-specific headers to /usr/include/gcc @@ -2582,7 +2582,7 @@ OLD_FILES+=usr/lib/libpam_ssh.a OLD_FILES+=usr/lib/libpam_ssh_p.a OLD_FILES+=usr/bin/help OLD_FILES+=usr/bin/sccs -.if ${TARGET_ARCH} != "amd64" && ${TARGET_ARCH} != "arm" && ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "powerpc" +.if ${TARGET_ARCH} != "amd64" && ${TARGET} != "arm" && ${TARGET_ARCH} != "i386" && ${TARGET} != "powerpc" OLD_FILES+=usr/bin/gdbserver .endif OLD_FILES+=usr/bin/ssh-keysign |
