16524455 Userland needs more 64-bit elves: lftp, m4, ncurses & tcpdump
authorNorm Jacobs <Norm.Jacobs@Oracle.COM>
Fri, 22 Mar 2013 09:27:41 -0700
changeset 1229 5da8394504c5
parent 1228 7c833611f21f
child 1230 51caab77ce23
16524455 Userland needs more 64-bit elves: lftp, m4, ncurses & tcpdump
components/lftp/Makefile
components/lftp/lftp.p5m
components/m4/Makefile
components/m4/m4.p5m
components/ncurses/ncurses.p5m
components/ncurses/patches/ncurses-03-config.patch
components/tcpdump/Makefile
components/tcpdump/tcpdump.p5m
--- a/components/lftp/Makefile	Fri Mar 22 09:41:03 2013 -0600
+++ b/components/lftp/Makefile	Fri Mar 22 09:27:41 2013 -0700
@@ -48,9 +48,9 @@
 ASLR_MODE = $(ASLR_ENABLE)
 
 # common targets
-build:		$(BUILD_32)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_64)
 
 test:		$(NO_TESTS)
 
--- a/components/lftp/lftp.p5m	Fri Mar 22 09:41:03 2013 -0600
+++ b/components/lftp/lftp.p5m	Fri Mar 22 09:27:41 2013 -0700
@@ -72,8 +72,8 @@
 dir path=usr/share/man/man4
 file path=etc/lftp.conf mode=0644 preserve=renamenew \
     original_name=SUNWlftp:etc/lftp.conf
-file path=usr/bin/lftp
-file path=usr/bin/lftpget
+file usr/bin/$(MACH64)/lftp path=usr/bin/lftp
+file usr/bin/$(MACH64)/lftpget path=usr/bin/lftpget
 file path=usr/share/lftp/convert-mozilla-cookies mode=0555
 file path=usr/share/lftp/import-ncftp mode=0555
 file path=usr/share/lftp/import-netscape mode=0555
--- a/components/m4/Makefile	Fri Mar 22 09:41:03 2013 -0600
+++ b/components/m4/Makefile	Fri Mar 22 09:27:41 2013 -0700
@@ -46,11 +46,11 @@
 ASLR_MODE = $(ASLR_ENABLE)
 
 # common targets
-build:		$(BUILD_32)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_64)
 
-test:		$(TEST_32)
+test:		$(TEST_64)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/m4/m4.p5m	Fri Mar 22 09:41:03 2013 -0600
+++ b/components/m4/m4.p5m	Fri Mar 22 09:27:41 2013 -0700
@@ -50,7 +50,7 @@
 dir path=usr/share/info
 dir path=usr/share/man
 dir path=usr/share/man/man1
-file path=usr/gnu/bin/m4
+file usr/gnu/bin/$(MACH64)/m4 path=usr/gnu/bin/m4
 file path=usr/gnu/share/man/man1/m4.1
 file path=usr/share/info/m4.info
 file path=usr/share/info/m4.info-1
--- a/components/ncurses/ncurses.p5m	Fri Mar 22 09:41:03 2013 -0600
+++ b/components/ncurses/ncurses.p5m	Fri Mar 22 09:27:41 2013 -0700
@@ -52,16 +52,18 @@
 link path=usr/bin/gtset target=../gnu/bin/tset facet.compat.gnulinks=true
 dir  path=usr/gnu
 dir  path=usr/gnu/bin
+dir  path=usr/gnu/bin/$(MACH64)
+file path=usr/gnu/bin/$(MACH64)/ncurses5-config
 link path=usr/gnu/bin/captoinfo target=tic
-file path=usr/gnu/bin/clear
-file path=usr/gnu/bin/infocmp
+file usr/gnu/bin/$(MACH64)/clear path=usr/gnu/bin/clear
+file usr/gnu/bin/$(MACH64)/infocmp path=usr/gnu/bin/infocmp
 link path=usr/gnu/bin/infotocap target=tic
 file path=usr/gnu/bin/ncurses5-config
 link path=usr/gnu/bin/reset target=tset
-file path=usr/gnu/bin/tic
-file path=usr/gnu/bin/toe
-file path=usr/gnu/bin/tput
-file path=usr/gnu/bin/tset
+file usr/gnu/bin/$(MACH64)/tic path=usr/gnu/bin/tic
+file usr/gnu/bin/$(MACH64)/toe path=usr/gnu/bin/toe
+file usr/gnu/bin/$(MACH64)/tput path=usr/gnu/bin/tput
+file usr/gnu/bin/$(MACH64)/tset path=usr/gnu/bin/tset
 dir  path=usr/gnu/lib
 dir  path=usr/gnu/lib/$(MACH64)
 link path=usr/gnu/lib/$(MACH64)/libform.so target=libform.so.5
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ncurses/patches/ncurses-03-config.patch	Fri Mar 22 09:27:41 2013 -0700
@@ -0,0 +1,13 @@
+# This is fixed in 5.9
+#
+--- ncurses-5.7/misc/ncurses-config.in.orig	Thu Mar 21 15:04:44 2013
++++ ncurses-5.7/misc/ncurses-config.in	Thu Mar 21 15:05:22 2013
[email protected]@ -87,7 +87,7 @@
+ 		;;
+ 	--libs)
+ 		sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
+-			-L${exec_prefix}/lib @[email protected] -l${THIS} @[email protected]
++			-L${libdir} @[email protected] -l${THIS} @[email protected]
+ ENDECHO
+ 		;;
+ 	# identification
--- a/components/tcpdump/Makefile	Fri Mar 22 09:41:03 2013 -0600
+++ b/components/tcpdump/Makefile	Fri Mar 22 09:27:41 2013 -0700
@@ -36,8 +36,8 @@
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
-# the default setting of 8s makes us core dump
-studio_ALIGN.sparc.32=
+# fix my alignment issues instead of falling over on sparc
+studio_ALIGN.sparc.64=-xmemalign=16i
 
 CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS += --enable-ipv6=yes
@@ -47,14 +47,14 @@
 ASLR_MODE = $(ASLR_ENABLE)
 
 # common targets
-build:          $(BUILD_32)
+build:          $(BUILD_64)
 
-install:        $(INSTALL_32) 
+install:        $(INSTALL_64) 
 
 COMPONENT_PRE_TEST_ACTION = \
         ($(CP) -r $(SOURCE_DIR)/tests $(@D)/.)
 
-test:		$(TEST_32)
+test:		$(TEST_64)
 
 
 BUILD_PKG_DEPENDENCIES =        $(BUILD_TOOLS)
--- a/components/tcpdump/tcpdump.p5m	Fri Mar 22 09:41:03 2013 -0600
+++ b/components/tcpdump/tcpdump.p5m	Fri Mar 22 09:27:41 2013 -0700
@@ -41,6 +41,6 @@
 dir path=usr/share
 dir path=usr/share/man
 dir path=usr/share/man/man1
-file path=usr/sbin/tcpdump
+file usr/sbin/$(MACH64)/tcpdump path=usr/sbin/tcpdump
 file path=usr/share/man/man1/tcpdump.1
 license tcpdump.license license=BSD