| components/ksh93/Makefile | ●●●●● patch | view | raw | blame | history | |
| components/ksh93/ksh93.p5m | ●●●●● patch | view | raw | blame | history | |
| components/ksh93/patches/build_cflags.patch | ●●●●● patch | view | raw | blame | history | |
| components/ksh93/patches/compiler.patch | ●●●●● patch | view | raw | blame | history | |
| components/ksh93/patches/disable_dll.patch | ●●●●● patch | view | raw | blame | history | |
| components/ksh93/patches/multi_lang_arith.patch | ●●●●● patch | view | raw | blame | history | |
| make-rules/attpackagemake.mk | ●●●●● patch | view | raw | blame | history |
components/ksh93/Makefile
@@ -56,13 +56,14 @@ COMPONENT_ARCHIVE_HASH_1= \ sha256:44ae3913e6c0c8992c6c3cba16864fd4c4a18c6da8e7d87c85a23060cea7cd1a COMPONENT_ARCHIVE_URL_1= http://www2.research.att.com/~gsf/download/tgz/$(COMPONENT_ARCHIVE_1) COMPONENT_PATCHES_1= solaris_alias.patch build_cflags.patch path_utmp.patch \ COMPONENT_PATCHES_1= compiler.patch path_utmp.patch\ solaris_alias.patch \ CR6919590.patch CR7033181.patch \ CR7071431.patch CR7036535.patch \ CRXXX_Error_Catalog.patch CR7025778.patch \ CR7065478.patch CR7026179.patch \ CR7065900.patch CR7110983.patch \ CR7105086.patch disable_dll.patch \ CR7105086.patch multi_lang_arith.patch \ CR7057565.patch CR7046434.patch \ CR7032821.patch CR7009897.patch \ CR6964621.patch CR7032068.patch \ @@ -72,8 +73,9 @@ MAP_TYPE_64_Bits.patch CR7167466.patch \ CR7168611.patch # Fixup HOSTTYPE to match uname output and bits HOSTTYPE32=sol11.$(shell uname -p) HOSTTYPE64=sol11.$(shell uname -p)-64 # Make the unpack of the second archive relocate to a sensible place UNPACK_ARGS_1= -r $(COMPONENT_SRC_1) @@ -89,13 +91,16 @@ CC.LD.ORIGIN= CC.DLL.ORIGIN= # Fix up the permissions of the compiler wrapper scripts from the patch COMPONENT_PRE_BUILD_ACTION=($(CHMOD) +x $(@D)/src/cmd/INIT/cc.sol11.*) # Prevent nmake from taking over the entire machine NPROCS=1 NPROC=1 # Set the built to build all targets, install all of ast-base, and test ksh93. COMPONENT_BUILD_TARGETS += COMPONENT_INSTALL_PACKAGES += ast-base COMPONENT_TEST_TARGETS += ksh93 COMPONENT_TEST_TARGETS = ksh93 # Unpack the ast-base tarball and copy it into the INIT tree, # mark it as un-patched components/ksh93/ksh93.p5m
@@ -50,9 +50,9 @@ preserve=renameold file $(MACH32)/bin/ksh path=usr/bin/$(MACH32)/ksh mode=0555 file $(MACH32)/bin/shcomp path=usr/bin/$(MACH32)/shcomp mode=0555 file $(MACH64)/bin/alias path=usr/bin/alias mode=0555 file $(MACH64)/bin/ksh path=usr/bin/$(MACH64)/ksh mode=0555 file $(MACH64)/bin/shcomp path=usr/bin/$(MACH64)/shcomp mode=0555 file $(MACH64)/bin/alias path=usr/bin/alias mode=0555 file alias.1.ja_JP.UTF-8 path=usr/share/man/ja_JP.UTF-8/man1/alias.1 file jsh.1.ja_JP.UTF-8 path=usr/share/man/ja_JP.UTF-8/man1/jsh.1 file ksh.1.ja_JP.UTF-8 path=usr/share/man/ja_JP.UTF-8/man1/ksh.1 @@ -96,6 +96,7 @@ hardlink path=usr/bin/read target=alias hardlink path=usr/bin/rksh target=../lib/isaexec hardlink path=usr/bin/rksh93 target=../lib/isaexec hardlink path=usr/bin/shcomp target=../lib/isaexec hardlink path=usr/bin/test target=alias hardlink path=usr/bin/type target=alias hardlink path=usr/bin/ulimit target=alias components/ksh93/patches/build_cflags.patch
File was deleted components/ksh93/patches/compiler.patch
New file @@ -0,0 +1,52 @@ diff -rupN INIT.2011-02-08/src/cmd/INIT/cc.sol11.i386-64 INIT.2011-02-08.patched/src/cmd/INIT/cc.sol11.i386-64 diff -rupN INIT.2011-02-08/src/cmd/INIT/cc.sol11.i386-64 INIT.2011-02-08.patched/src/cmd/INIT/cc.sol11.i386-64 --- INIT.2011-02-08/src/cmd/INIT/cc.sol11.i386-64 1970-01-01 01:00:00.000000000 +0100 +++ INIT.2011-02-08.patched/src/cmd/INIT/cc.sol11.i386-64 2012-05-18 10:49:31.008310676 +0100 @@ -0,0 +1,9 @@ +: solaris.i386-64 cc wrapper for reasonable ansi C defaults and 64 bit : 2012-05-18 : + +HOSTTYPE=sol11.i386-64 + +case " $* " in +*" -dumpmachine "*) echo $HOSTTYPE; exit ;; +esac + +$CC_EXPLICIT -m64 -xc99 -D_XPG6 "$@" --- INIT.2011-02-08/src/cmd/INIT/cc.sol11.i386 1970-01-01 01:00:00.000000000 +0100 +++ INIT.2011-02-08.patched/src/cmd/INIT/cc.sol11.i386 2012-05-18 10:49:31.008310676 +0100 @@ -0,0 +1,9 @@ +: solaris.i386 cc wrapper for reasonable ansi C defaults and 32 bit : 2012-05-18 : + +HOSTTYPE=sol11.i386 + +case " $* " in +*" -dumpmachine "*) echo $HOSTTYPE; exit ;; +esac + +$CC_EXPLICIT -m32 -xc99 -D_XPG6 "$@" diff -rupN INIT.2011-02-08/src/cmd/INIT/cc.sol11.sun4-64 INIT.2011-02-08.patched/src/cmd/INIT/cc.sol11.sun4-64 --- INIT.2011-02-08/src/cmd/INIT/cc.sol11.sun4-64 1970-01-01 01:00:00.000000000 +0100 +++ INIT.2011-02-08.patched/src/cmd/INIT/cc.sol11.sun4-64 2012-05-18 10:49:20.339537677 +0100 @@ -0,0 +1,9 @@ +: solaris.sun4-64 cc wrapper for reasonable ansi C defaults and 64 bit : 2012-05-18 : + +HOSTTYPE=sol11.sun4-64 + +case " $* " in +*" -dumpmachine "*) echo $HOSTTYPE; exit ;; +esac + +$CC_EXPLICIT -m64 -xc99 -D_XPG6 "$@" diff -rupN INIT.2011-02-08/src/cmd/INIT/cc.sol11.sun4 INIT.2011-02-08.patched/src/cmd/INIT/cc.sol11.sun4-64 --- INIT.2011-02-08/src/cmd/INIT/cc.sol11.sun4 1970-01-01 01:00:00.000000000 +0100 +++ INIT.2011-02-08.patched/src/cmd/INIT/cc.sol11.sun4 2012-05-18 10:49:20.339537677 +0100 @@ -0,0 +1,9 @@ +: solaris.sun4 cc wrapper for reasonable ansi C defaults and 32 bit : 2012-05-18 : + +HOSTTYPE=sol11.sun4 + +case " $* " in +*" -dumpmachine "*) echo $HOSTTYPE; exit ;; +esac + +$CC_EXPLICIT -m32 -xc99 -D_XPG6 "$@" components/ksh93/patches/disable_dll.patch
File was deleted components/ksh93/patches/multi_lang_arith.patch
@@ -6,7 +6,7 @@ fraction = digits; } - else if (c != thousand) + else if (c != thousand || (c == thousand && decimal == -1) + else if (c != thousand || (c == thousand && decimal == -1)) break; else if (!(m = digits)) { make-rules/attpackagemake.mk
@@ -47,21 +47,22 @@ # Environment variables and arguments passed into the build and install # environment(s). These are the initial settings. COMPONENT_BUILD_ENV += \ CC="$(CC)" \ CCFLAGS="$(CFLAGS)" \ CCFLAGS.FORCE="$(CXXFLAGS)" \ CC.RUNPATH="$(CC.RUNPATH)" \ CC.LD.RUNPATH="$(CC.LD.RUNPATH)" \ CC.LD.ORIGIN="$(CC.LD.ORIGIN)" \ CC.DLL.ORIGIN="$(CC.DLL.ORIGIN)" \ CCLDFLAGS="$(CXXFLAGS)" \ LDOPTIONS="$(CXXFLAGS)" \ NPROCS="$(NPROCS)" \ LDFLAGS="$(CXXFLAGS)" CC_EXPLICIT="$(CC)" \ PATH=$(shell dirname $(CC)):$(PATH) \ CC=$(shell basename $(CC)) NPROC="$(NPROC)" # This is a workaround for the AT&T nmake failing to always use # the environmental CCFLAGS in sub-compiles COMPONENT_BUILD_ARGS= $(COMPONENT_BUILD_ENV) # This explicitly exports the build type for 32/64 bit distinction COMPONENT_BUILD_ARGS = \ HOSTTYPE="$(HOSTTYPE$(BITS))" \ CCFLAGS="$(CFLAGS)" \ LDFLAGS="$(CXXFLAGS)" # The install and test process needs the same environment as the build COMPONENT_INSTALL_ENV = $(COMPONENT_BUILD_ENV) COMPONENT_TEST_ENV = $(COMPONENT_BUILD_ENV) COMPONENT_INSTALL_ARGS = HOSTTYPE="$(HOSTTYPE$(BITS))" COMPONENT_TEST_ARGS = HOSTTYPE="$(HOSTTYPE$(BITS))" # build the configured source $(BUILD_DIR)/%/.built: $(SOURCE_DIR)/.prep @@ -77,8 +78,9 @@ $(BUILD_DIR)/%/.installed: $(BUILD_DIR)/%/.built $(COMPONENT_PRE_INSTALL_ACTION) $(RM) -r $(PROTO_DIR)/$(MACH$(BITS)); $(MKDIR) $(PROTO_DIR)/$(MACH$(BITS)); cd $(@D) ; $(ENV) $(COMPONENT_INSTALL_ENV) \ cd $(@D); $(ENV) $(COMPONENT_INSTALL_ENV) \ bin/package flat $(COMPONENT_INSTALL_TARGETS) \ $(COMPONENT_INSTALL_ARGS) \ $(PROTO_DIR)/$(MACH$(BITS)) $(COMPONENT_INSTALL_PACKAGES) $(COMPONENT_POST_INSTALL_ACTION) $(TOUCH) $@ @@ -86,8 +88,9 @@ # test the built source $(BUILD_DIR)/%/.tested: $(BUILD_DIR)/%/.built $(COMPONENT_PRE_TEST_ACTION) cd $(@D) ; $(ENV) $(COMPONENT_TEST_ENV) bin/package \ test $(COMPONENT_TEST_TARGETS) cd $(@D); $(ENV) $(COMPONENT_TEST_ENV) \ bin/package test $(COMPONENT_TEST_TARGETS) \ $(COMPONENT_TEST_ARGS) $(COMPONENT_POST_TEST_ACTION) $(TOUCH) $@
