pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/tk83 make this build and install on irix64
details: https://anonhg.NetBSD.org/pkgsrc/rev/ff4ac7ae61dc
branches: trunk
changeset: 490305:ff4ac7ae61dc
user: jschauma <jschauma%pkgsrc.org@localhost>
date: Sun Mar 06 22:41:28 2005 +0000
description:
make this build and install on irix64
diffstat:
x11/tk83/Makefile | 8 +-
x11/tk83/distinfo | 6 +-
x11/tk83/patches/patch-ab | 218 ++++++++++++++++++++++++++++-----------------
x11/tk83/patches/patch-ac | 63 ++++++++++--
4 files changed, 197 insertions(+), 98 deletions(-)
diffs (truncated from 1010 to 300 lines):
diff -r ce84281df8e8 -r ff4ac7ae61dc x11/tk83/Makefile
--- a/x11/tk83/Makefile Sun Mar 06 22:29:26 2005 +0000
+++ b/x11/tk83/Makefile Sun Mar 06 22:41:28 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/03/08 20:07:38 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2005/03/06 22:41:28 jschauma Exp $
DISTNAME= tk8.3.4
PKGNAME= tk-8.3.4
@@ -27,6 +27,12 @@
#
CONFIGURE_ARGS+= --mandir=${WRKDIR}/man
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(ABI) && ${ABI} == "64"
+CONFIGURE_ARGS+= --enable-64bit
+.endif
+
# Modify mkLinks script to remove the short-filename manpage if it was
# linked to a longer filename.
#
diff -r ce84281df8e8 -r ff4ac7ae61dc x11/tk83/distinfo
--- a/x11/tk83/distinfo Sun Mar 06 22:29:26 2005 +0000
+++ b/x11/tk83/distinfo Sun Mar 06 22:41:28 2005 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 17:36:20 wiz Exp $
+$NetBSD: distinfo,v 1.3 2005/03/06 22:41:28 jschauma Exp $
SHA1 (tk8.3.4.tar.gz) = d52bf5cedb73e9b817ba8d6a2b00701f4f82fad2
RMD160 (tk8.3.4.tar.gz) = f154fd9b2eedcff732b9cdabee48bd9af1b3dd26
Size (tk8.3.4.tar.gz) = 2589635 bytes
SHA1 (patch-aa) = 213c82956f692cc493215e222c08da76cf18841e
-SHA1 (patch-ab) = b99c7a48dc525a45305ad6265735de56df4b5d9c
-SHA1 (patch-ac) = 172762efa65eb05345d70cf38893bc96b56a2481
+SHA1 (patch-ab) = 0a75ddf9d30ba4e4800f8139674f712785ae83af
+SHA1 (patch-ac) = 4b2b967030998dc108457258ee603fa94185cfe5
SHA1 (patch-ad) = 1815fc19986674cb2ea03a8d60cd1514ff47fba9
diff -r ce84281df8e8 -r ff4ac7ae61dc x11/tk83/patches/patch-ab
--- a/x11/tk83/patches/patch-ab Sun Mar 06 22:29:26 2005 +0000
+++ b/x11/tk83/patches/patch-ab Sun Mar 06 22:41:28 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
+$NetBSD: patch-ab,v 1.2 2005/03/06 22:41:28 jschauma Exp $
--- configure.orig Fri Oct 19 20:24:40 2001
-+++ configure Sun Mar 16 13:25:15 2003
++++ configure Sun Mar 6 16:52:43 2005
@@ -1746,6 +1746,7 @@
do64bit_ok=no
@@ -100,7 +100,53 @@
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
-@@ -2136,20 +2137,23 @@
+@@ -2084,8 +2085,11 @@
+ LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ EXTRA_CFLAGS=""
+ LDFLAGS=""
++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
++ TCL_LIB_VERSIONS_OK=nodots
+ ;;
+- IRIX-6.*|IRIX64-6.5*)
++ IRIX-6.*)
+ SHLIB_CFLAGS=""
+ SHLIB_LD="ld -n32 -shared -rdata_shared"
+ SHLIB_LD_LIBS='${LIBS}'
+@@ -2108,6 +2112,9 @@
+ esac
+ LDFLAGS="-n32"
+ fi
++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
++ TCL_LIB_VERSIONS_OK=nodots
+ ;;
+ IRIX64-6.*)
+ SHLIB_CFLAGS=""
+@@ -2118,6 +2125,22 @@
+ DL_LIBS=""
+ LDFLAGS=""
+ LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
++
++ # Check to enable 64-bit flags for compiler/linker
++
++ if test "$do64bit" = "yes" ; then
++ if test "$GCC" = "yes" ; then
++ echo "configure: warning: 64bit mode not supported by gcc" 1>&2
++ else
++ do64bit_ok=yes
++ SHLIB_LD="ld -64 -shared -rdata_shared"
++ CFLAGS="$CFLAGS -64"
++ LDFLAGS="$LDFLAGS -64"
++ fi
++ fi
++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
++ TCL_LIB_VERSIONS_OK=nodots
+ ;;
+ Linux*)
+ SHLIB_CFLAGS="-fPIC"
+@@ -2136,20 +2159,23 @@
DL_LIBS="-ldl"
LDFLAGS="-rdynamic"
LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
@@ -127,7 +173,7 @@
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
-@@ -2206,17 +2210,17 @@
+@@ -2206,17 +2232,17 @@
else
ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dld.h""... $ac_c" 1>&6
@@ -148,7 +194,7 @@
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
-@@ -2271,17 +2275,17 @@
+@@ -2271,17 +2297,17 @@
# Not available on all versions: check for include file.
ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
@@ -169,7 +215,7 @@
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
-@@ -2300,7 +2304,6 @@
+@@ -2300,7 +2326,6 @@
# NetBSD/SPARC needs -fPIC, -fpic will not do.
SHLIB_CFLAGS="-fPIC"
@@ -177,7 +223,7 @@
SHLIB_LD_LIBS=""
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
-@@ -2321,13 +2324,23 @@
+@@ -2321,13 +2346,23 @@
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
@@ -201,7 +247,7 @@
fi
rm -f conftest*
-@@ -2539,6 +2552,9 @@
+@@ -2539,6 +2574,9 @@
DL_LIBS="-ldl"
LDFLAGS=""
LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
@@ -211,7 +257,7 @@
;;
SunOS-5*)
-@@ -2586,6 +2602,9 @@
+@@ -2586,6 +2624,9 @@
else
LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
fi
@@ -221,7 +267,7 @@
;;
ULTRIX-4.*)
SHLIB_CFLAGS="-G 0"
-@@ -2611,17 +2630,17 @@
+@@ -2611,10 +2652,10 @@
# that don't grok the -Bexport option. Test that it does.
hold_ldflags=$LDFLAGS
echo $ac_n "checking for ld accepts -Bexport flag""... $ac_c" 1>&6
@@ -234,6 +280,7 @@
#include "confdefs.h"
int main() {
+@@ -2621,7 +2662,7 @@
int i;
; return 0; }
EOF
@@ -242,7 +289,7 @@
rm -rf conftest*
found=yes
else
-@@ -2667,9 +2686,9 @@
+@@ -2667,9 +2708,9 @@
if test "x$DL_OBJS" = "xtclLoadAout.o" ; then
echo $ac_n "checking sys/exec.h""... $ac_c" 1>&6
@@ -254,7 +301,7 @@
#include "confdefs.h"
#include <sys/exec.h>
int main() {
-@@ -2687,7 +2706,7 @@
+@@ -2687,7 +2728,7 @@
; return 0; }
EOF
@@ -263,7 +310,7 @@
rm -rf conftest*
tcl_ok=usable
else
-@@ -2705,9 +2724,9 @@
+@@ -2705,9 +2746,9 @@
else
echo $ac_n "checking a.out.h""... $ac_c" 1>&6
@@ -275,7 +322,7 @@
#include "confdefs.h"
#include <a.out.h>
int main() {
-@@ -2725,7 +2744,7 @@
+@@ -2725,7 +2766,7 @@
; return 0; }
EOF
@@ -284,7 +331,7 @@
rm -rf conftest*
tcl_ok=usable
else
-@@ -2743,9 +2762,9 @@
+@@ -2743,9 +2784,9 @@
else
echo $ac_n "checking sys/exec_aout.h""... $ac_c" 1>&6
@@ -296,7 +343,7 @@
#include "confdefs.h"
#include <sys/exec_aout.h>
int main() {
-@@ -2763,7 +2782,7 @@
+@@ -2763,7 +2804,7 @@
; return 0; }
EOF
@@ -305,7 +352,7 @@
rm -rf conftest*
tcl_ok=usable
else
-@@ -2860,7 +2879,7 @@
+@@ -2860,7 +2901,7 @@
echo $ac_n "checking for build with symbols""... $ac_c" 1>&6
@@ -314,7 +361,7 @@
# Check whether --enable-symbols or --disable-symbols was given.
if test "${enable_symbols+set}" = set; then
enableval="$enable_symbols"
-@@ -2904,12 +2923,12 @@
+@@ -2904,12 +2945,12 @@
#--------------------------------------------------------------------
echo $ac_n "checking for sin""... $ac_c" 1>&6
@@ -329,7 +376,7 @@
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char sin(); below. */
-@@ -2932,7 +2951,7 @@
+@@ -2932,7 +2973,7 @@
; return 0; }
EOF
@@ -338,7 +385,7 @@
rm -rf conftest*
eval "ac_cv_func_sin=yes"
else
-@@ -2953,7 +2972,7 @@
+@@ -2953,7 +2994,7 @@
fi
echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6
@@ -347,7 +394,7 @@
ac_lib_var=`echo ieee'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2961,14 +2980,14 @@
+@@ -2961,7 +3002,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lieee $LIBS"
cat > conftest.$ac_ext <<EOF
@@ -356,6 +403,7 @@
#include "confdefs.h"
int main() {
+@@ -2968,7 +3009,7 @@
main()
; return 0; }
EOF
@@ -364,7 +412,7 @@
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
-@@ -2999,7 +3018,7 @@
+@@ -2999,7 +3040,7 @@
libbsd=no
if test "`uname -s`" = "AIX" ; then
echo $ac_n "checking for gettimeofday in -lbsd""... $ac_c" 1>&6
@@ -373,7 +421,7 @@
ac_lib_var=`echo bsd'_'gettimeofday | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3007,7 +3026,7 @@
+@@ -3007,7 +3048,7 @@
ac_save_LIBS="$LIBS"
Home |
Main Index |
Thread Index |
Old Index