Tue May 13 11:40:24 2008 UTC ()
Enable USE_CHECK_SHLIBS_ELF on FreeBSD. Aleksej Saushev PR pkg/38606.


(tnn)
diff -r1.5 -r1.6 pkgsrc/mk/check/bsd.check-vars.mk
diff -r1.24 -r1.25 pkgsrc/mk/platform/FreeBSD.mk
cvs diff -r1.5 -r1.6 pkgsrc/mk/check/bsd.check-vars.mk (expand / switch to unified diff)

--- pkgsrc/mk/check/bsd.check-vars.mk 2008/03/09 13:47:08 1.5
+++ pkgsrc/mk/check/bsd.check-vars.mk 2008/05/13 11:40:24 1.6
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: bsd.check-vars.mk,v 1.5 2008/03/09 13:47:08 joerg Exp $ 1# $NetBSD: bsd.check-vars.mk,v 1.6 2008/05/13 11:40:24 tnn Exp $
2# 2#
3# This Makefile fragment is included separately by bsd.pkg.mk and 3# This Makefile fragment is included separately by bsd.pkg.mk and
4# defines some variables which must be defined earlier than where 4# defines some variables which must be defined earlier than where
5# bsd.check.mk is included. 5# bsd.check.mk is included.
6# 6#
7 7
8CHECK_FILES_SUPPORTED?= yes 8CHECK_FILES_SUPPORTED?= yes
9CHECK_SHLIBS_SUPPORTED?= yes 9CHECK_SHLIBS_SUPPORTED?= yes
10 10
11.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" 11.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD"
12USE_CHECK_SHLIBS_ELF?= yes 12USE_CHECK_SHLIBS_ELF?= yes
13.else 13.else
14USE_CHECK_SHLIBS_ELF?= no 14USE_CHECK_SHLIBS_ELF?= no
15.endif 15.endif
16 16
17USE_TOOLS+= awk cat cmp diff echo find grep rm sed test touch true 17USE_TOOLS+= awk cat cmp diff echo find grep rm sed test touch true
18 18
19.if !empty(USE_CHECK_SHLIBS_ELF:M[yY][eE][sS]) 19.if !empty(USE_CHECK_SHLIBS_ELF:M[yY][eE][sS])
20USE_TOOLS+= readelf 20USE_TOOLS+= readelf
21.endif 21.endif
cvs diff -r1.24 -r1.25 pkgsrc/mk/platform/FreeBSD.mk (expand / switch to unified diff)

--- pkgsrc/mk/platform/FreeBSD.mk 2008/03/04 06:45:34 1.24
+++ pkgsrc/mk/platform/FreeBSD.mk 2008/05/13 11:40:24 1.25
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: FreeBSD.mk,v 1.24 2008/03/04 06:45:34 jlam Exp $ 1# $NetBSD: FreeBSD.mk,v 1.25 2008/05/13 11:40:24 tnn Exp $
2# 2#
3# Variable definitions for the FreeBSD operating system. 3# Variable definitions for the FreeBSD operating system.
4 4
5BRANDELF?= /usr/bin/brandelf # used by linux compat layer 5BRANDELF?= /usr/bin/brandelf # used by linux compat layer
6ECHO_N?= ${ECHO} -n 6ECHO_N?= ${ECHO} -n
7IMAKE_MAKE?= ${MAKE} # program which gets invoked by imake 7IMAKE_MAKE?= ${MAKE} # program which gets invoked by imake
8IMAKEOPTS+= -DBuildHtmlManPages=NO 8IMAKEOPTS+= -DBuildHtmlManPages=NO
9PKGLOCALEDIR?= share 9PKGLOCALEDIR?= share
10PS?= /bin/ps 10PS?= /bin/ps
11PW?= /usr/sbin/pw 11PW?= /usr/sbin/pw
12SU?= /usr/bin/su 12SU?= /usr/bin/su
13TYPE?= type # Shell builtin 13TYPE?= type # Shell builtin
14 14
@@ -39,26 +39,28 @@ IMAKE_GAMEMAN_SUFFIX= 6 @@ -39,26 +39,28 @@ IMAKE_GAMEMAN_SUFFIX= 6
39IMAKE_MISCMAN_SUFFIX= 7 39IMAKE_MISCMAN_SUFFIX= 7
40IMAKE_MAN_DIR= ${IMAKE_MAN_SOURCE_PATH}1 40IMAKE_MAN_DIR= ${IMAKE_MAN_SOURCE_PATH}1
41IMAKE_LIBMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}3 41IMAKE_LIBMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}3
42IMAKE_KERNMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}4 42IMAKE_KERNMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}4
43IMAKE_FILEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}5 43IMAKE_FILEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}5
44IMAKE_GAMEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}6 44IMAKE_GAMEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}6
45IMAKE_MISCMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}7 45IMAKE_MISCMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}7
46IMAKE_MANNEWSUFFIX= ${IMAKE_MAN_SUFFIX} 46IMAKE_MANNEWSUFFIX= ${IMAKE_MAN_SUFFIX}
47IMAKE_MANINSTALL?= maninstall catinstall 47IMAKE_MANINSTALL?= maninstall catinstall
48 48
49_OPSYS_EMULDIR.freebsd= # empty 49_OPSYS_EMULDIR.freebsd= # empty
50_OPSYS_EMULDIR.linux= /compat/linux 50_OPSYS_EMULDIR.linux= /compat/linux
51 51
 52_OPSYS_SYSTEM_RPATH?= /lib:/usr/lib # STANDARD_LIBRARY_PATH (from rtld.h)
 53
52.if exists(/usr/include/netinet6) 54.if exists(/usr/include/netinet6)
53_OPSYS_HAS_INET6= yes # IPv6 is standard 55_OPSYS_HAS_INET6= yes # IPv6 is standard
54.else 56.else
55_OPSYS_HAS_INET6= no # IPv6 is not standard 57_OPSYS_HAS_INET6= no # IPv6 is not standard
56.endif 58.endif
57_OPSYS_HAS_JAVA= no # Java is not standard 59_OPSYS_HAS_JAVA= no # Java is not standard
58_OPSYS_HAS_MANZ= yes # MANZ controls gzipping of man pages 60_OPSYS_HAS_MANZ= yes # MANZ controls gzipping of man pages
59_OPSYS_HAS_OSSAUDIO= yes # libossaudio is available 61_OPSYS_HAS_OSSAUDIO= yes # libossaudio is available
60_OPSYS_PERL_REQD= # no base version of perl required 62_OPSYS_PERL_REQD= # no base version of perl required
61_OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads 63_OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads
62_OPSYS_SHLIB_TYPE= ELF/a.out # shared lib type 64_OPSYS_SHLIB_TYPE= ELF/a.out # shared lib type
63_PATCH_CAN_BACKUP= yes # native patch(1) can make backups 65_PATCH_CAN_BACKUP= yes # native patch(1) can make backups
64_PATCH_BACKUP_ARG?= -V simple -b # switch to patch(1) for backup suffix 66_PATCH_BACKUP_ARG?= -V simple -b # switch to patch(1) for backup suffix