Skip to content
Browse files

OS-825 build everything in illumos-extra out of the gcc in the proto …

…area

OS-842 parallelize illumos-extra
OS-716 platform build depends on Sun Studio
  • Loading branch information...
1 parent 5674ac8 commit 5ee0fb03423b8c4ecca0ef13738ecc62bd982e1d @JohnSonnenschein JohnSonnenschein committed Jan 3, 2012
View
19 Makefile
@@ -23,13 +23,15 @@
# To build everything just run 'gmake' in this directory.
#
-PATH=/sbin:/usr/sbin:/usr/bin:/opt/SUNWspro/bin:/opt/local/bin
BASE=$(PWD)
DESTDIR=$(BASE)/proto
-SUBDIRS= bash bzip2 curl dialog g11n gcc gcc4 gnupg gtar gzip less libexpat \
+PATH=$(DESTDIR)/usr/sfw/bin:/usr/sfw/bin:/usr/gnu/bin:/opt/local/bin:/sbin:/usr/sbin:/usr/bin:/opt/SUNWspro/bin:/opt/local/bin
+SUBDIRS= bash bzip2 curl dialog g11n gnupg gtar gzip less libexpat \
libidn libm libxml libz ncurses node.js nss-nspr ntp openldap openssl \
perl rsync screen socat uuid vim wget
+PARALLEL=-j128
+
NAME=illumos-extra
AWK=$(shell (which gawk 2>/dev/null | grep -v "^no ") || which awk)
@@ -42,7 +44,7 @@ endif
GITDESCRIBE=g$(shell git describe --all --long | $(AWK) -F'-g' '{print $$NF}')
TARBALL=$(NAME)-$(BRANCH)-$(TIMESTAMP)-$(GITDESCRIBE).tgz
--include Makefile.inc
+all: $(SUBDIRS)
#
# pkg-config may be installed. This will actually only hurt us rather than help
@@ -52,13 +54,16 @@ TARBALL=$(NAME)-$(BRANCH)-$(TIMESTAMP)-$(GITDESCRIBE).tgz
# environment variable nulls out the search path. Other vars just control what
# gets appended.
#
-$(SUBDIRS): FRC
- cd $@; PKG_CONFIG_LIBDIR="" $(MAKE) DESTDIR=$(DESTDIR) install
+$(DESTDIR)/usr/sfw/bin/gcc: FRC
+ cd gcc4; PKG_CONFIG_LIBDIR="" $(MAKE) PARALLEL=$(PARALLEL) DESTDIR=$(DESTDIR) install
+
+$(SUBDIRS): $(DESTDIR)/usr/sfw/bin/gcc
+ cd $@; PKG_CONFIG_LIBDIR="" $(MAKE) PARALLEL=$(PARALLEL) DESTDIR=$(DESTDIR) install
-install: $(SUBDIRS)
+install: $(SUBDIRS) gcc4
clean:
- -for dir in $(SUBDIRS); do (cd $$dir; $(MAKE) DESTDIR=$(DESTDIR) clean); done
+ -for dir in $(SUBDIRS) gcc4; do (cd $$dir; $(MAKE) DESTDIR=$(DESTDIR) clean); done
-rm -rf proto
manifest:
View
4 bash/Makefile
@@ -18,13 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2010 Joyent Inc.
+# Copyright (c) 2012 Joyent Inc.
#
VER=bash-4.1
BASE=$(PWD)
DESTDIR=$(BASE)/../proto
-MAKE=gmake
+MAKE="gmake $(PARALLEL)"
-include ../Makefile.inc
View
9 bzip2/Makefile
@@ -21,7 +21,7 @@
#
# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# Copyright (c) 2010 Joyent Inc.
+# Copyright (c) 2012 Joyent Inc.
#
# This makefile is unusual, because it builds both 32 and 64 bit
@@ -30,6 +30,7 @@
VER=bzip2-1.0.6
VER64=$(VER)-64
+GCC=$(DESTDIR)/usr/sfw/bin/gcc
all: real-all
@@ -38,13 +39,11 @@ all: real-all
all32: $(VER)/Makefile
(cd $(VER); env \
- "MAKE=/usr/ccs/bin/make" \
- /usr/ccs/bin/make)
+ CC=$(GCC) gmake)
all64: $(VER64)/Makefile
(cd $(VER64); env \
- "MAKE=/usr/ccs/bin/make" \
- /usr/ccs/bin/make)
+ CC="$(GCC) -m64 -fPIC" gmake)
install: all
/usr/bin/ksh93 ./install-bzip2 $(VER)
View
14 bzip2/makefile.build
@@ -25,7 +25,7 @@
# Copyright (c) 2010 Joyent Inc.
#
-CFLAGS = -KPIC -D_FILE_OFFSET_BITS=64
+CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64
OBJS= blocksort.o \
huffman.o \
@@ -35,18 +35,18 @@ OBJS= blocksort.o \
decompress.o \
bzlib.o
-all: libbz2.so .WAIT bzip2 bzip2recover
+all: libbz2.so bzip2 bzip2recover
bzip2: libbz2.so bzip2.o
- /opt/SUNWspro/bin/cc $(CFLAGS) -o bzip2 bzip2.o -L. -lbz2
+ gcc $(CFLAGS) -o bzip2 bzip2.o -L. -lbz2
bzip2recover: bzip2recover.o
- /opt/SUNWspro/bin/cc $(CFLAGS) -o bzip2recover bzip2recover.o
+ gcc $(CFLAGS) -o bzip2recover bzip2recover.o
libbz2.so: $(OBJS)
rm -f libbz2.so libbz2.so.1
- /opt/SUNWspro/bin/cc $(CFLAGS) $(XREGSFLAG) -G -h libbz2.so.1 -o libbz2.so.1 \
- -z defs -z text -zcombreloc $(OBJS) -M ../mapfile -L. \
+ gcc $(CFLAGS) $(XREGSFLAG) -shared -o libbz2.so.1 \
+ -Wl,-z,defs,-z,text,-zcombreloc $(OBJS) -Wl,-M,../mapfile -L. \
-L$(DESTDIR)/usr/lib -lc
ln -s libbz2.so.1 libbz2.so
@@ -68,4 +68,4 @@ test: bzip2
blocksort.o: blocksort.c
@cat words0
- /opt/SUNWspro/bin/cc $(CFLAGS) -c blocksort.c
+ gcc $(CFLAGS) -c blocksort.c
View
20 bzip2/makefile.build.64
@@ -22,10 +22,10 @@
# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# Copyright (c) 2010 Joyent Inc.
+# Copyright (c) 2012 Joyent Inc.
#
-CFLAGS64 = -m64 -KPIC -D_FILE_OFFSET_BITS=64
+CFLAGS64 = -m64 -fPIC -D_FILE_OFFSET_BITS=64
BLOBJ= blocksort.o
@@ -41,18 +41,18 @@ BZOBJS= \
bzip2.o \
bzip2recover.o
-all: libbz2.so .WAIT bzip2 bzip2recover
+all: libbz2.so bzip2 bzip2recover
bzip2: libbz2.so bzip2.o
- /opt/SUNWspro/bin/cc $(CFLAGS64) -o bzip2 bzip2.o -L. -lbz2
+ gcc $(CFLAGS64) -o bzip2 bzip2.o -L. -lbz2
bzip2recover: bzip2recover.o
- /opt/SUNWspro/bin/cc $(CFLAGS64) -o bzip2recover bzip2recover.o
+ gcc $(CFLAGS64) -o bzip2recover bzip2recover.o
libbz2.so: $(BLOBJ) $(OBJS)
rm -f libbz2.so libbz2.so.1
- /opt/SUNWspro/bin/cc $(CFLAGS64) $(XREGSFLAG64) -G -h libbz2.so.1 -o libbz2.so.1 \
- -z defs -z text -zcombreloc $(BLOBJ) $(OBJS) -M ../mapfile -L. \
+ gcc $(CFLAGS64) $(XREGSFLAG64) -shared -o libbz2.so.1 \
+ -Wl,-z,defs,-z,text,-zcombreloc,$(BLOBJ) $(OBJS) -Wl,-M,../mapfile -L. \
-L$(DESTDIR)/usr/lib -lc
ln -s libbz2.so.1 libbz2.so
@@ -74,7 +74,7 @@ test: bzip2
blocksort.o: blocksort.c
@cat words0
- /opt/SUNWspro/bin/cc $(CFLAGS64) $(XREGSFLAG64) -c blocksort.c
+ gcc $(CFLAGS64) $(XREGSFLAG64) -c blocksort.c
-$(OBJS) $(BZOBJS):
- /opt/SUNWspro/bin/cc $(CFLAGS64) $(XREGSFLAG64) -c $<
+#$(OBJS) $(BZOBJS):
+# gcc $(CFLAGS64) $(XREGSFLAG64) -c $<
View
8 curl/Makefile
@@ -18,25 +18,25 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2010 Joyent Inc.
+# Copyright (c) 2012 Joyent Inc.
#
VER=curl-7.21.2
BASE=$(PWD)
DESTDIR=$(BASE)/../proto
-GCC=/usr/bin/gcc
+GCC=$(DESTDIR)/usr/sfw/bin/gcc
-include ../Makefile.inc
all: $(VER)/config.status
( cd $(VER); \
- gmake CC=$(GCC))
+ gmake $(PARALLEL) CC=$(GCC))
install: all
mkdir -p $(DESTDIR)
( cd $(VER); \
- gmake CC=/usr/bin/gcc DESTDIR=$(DESTDIR) install)
+ gmake $(PARALLEL) CC=$(GCC) DESTDIR=$(DESTDIR) install)
clean:
rm -rf $(VER)
View
9 dialog/Makefile
@@ -29,20 +29,23 @@ VER=dialog-1.1-20111020
BASE=$(PWD)
DESTDIR=$(BASE)/../proto
+GCC=$(DESTDIR)/usr/sfw/bin/gcc
+GXX=$(DESTDIR)/usr/sfw/bin/g++
+
all: $(VER)/src/auto/config.status
(cd $(VER); env \
- "CC=gcc" "CXX=g++" \
+ "CC=$(GCC)" "CXX=$(GXX)" \
make -e)
install: all
(cd $(VER); env \
- "CC=gcc" "CXX=g++" \
+ "CC=$(GCC)" "CXX=$(GXX)" \
DESTDIR=$(DESTDIR) \
make -e install)
$(VER)/src/auto/config.status: $(VER)/configure
(cd $(VER); env \
- "CC=gcc" "CXX=g++" \
+ "CC=$(GCC)" "CXX=$(GXX)" \
./configure --prefix=/usr \
--mandir=/usr/share/man \
--disable-Xdialog )
View
100 gcc/Makefile
@@ -1,100 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-# Copyright 2011 Joyent Inc.
-#
-
-VER=gcc-3.4.3
-
-SFW_PATH="/usr/sfw/bin:/usr/bin:/usr/ccs/bin:/opt/local/bin"
-
-BASE=$(PWD)
-DESTDIR=$(BASE)/../proto
-
-all: $(VER)-i386-build/config.status
- (cd $(VER)-i386-build; env - \
- CC=gcc \
- CFLAGS="-g -O2" \
- DESTDIR=$(DESTDIR) \
- STAGE1_CFLAGS="-g -O2" \
- CFLAGS_FOR_TARGET="-g -O2" \
- PATH=$(SFW_PATH) \
- MAKE=gmake gmake \
- CFLAGS="-g -O2" \
- STAGE1_CFLAGS="-g -O2" \
- CFLAGS_FOR_TARGET="-g -O2" bootstrap)
-
-install: all
- (cd $(VER)-i386-build; env - \
- CC=gcc \
- CFLAGS="-g -O2" \
- STAGE1_CFLAGS="-g -O2" \
- CFLAGS_FOR_TARGET="-g -O2" \
- DESTDIR=$(DESTDIR) \
- PATH=$(SFW_PATH) \
- MAKE=gmake gmake \
- CFLAGS="-g -O2" \
- STAGE1_CFLAGS="-g -O2" \
- CFLAGS_FOR_TARGET="-g -O2" install)
- ROOT=$(DESTDIR) ksh93 ./install-sfw
-
-$(VER)-i386-build/config.status: clean $(VER)-i386-build $(VER)/configure
- (cd $(VER)-i386-build; env - \
- CC=gcc \
- CFLAGS="-g -O2" \
- DESTDIR=$(DESTDIR) \
- PATH=$(SFW_PATH) \
- MAKE=gmake \
- ../$(VER)/configure \
- --prefix=/usr/sfw \
- --with-as=/usr/sfw/bin/gas \
- --with-gnu-as \
- --with-ld=/usr/ccs/bin/ld \
- --without-gnu-ld \
- --enable-languages="c,c++,f77,objc" \
- --enable-shared)
-
-$(VER)/configure: $(VER).tar.gz
- /usr/bin/gzip -dc $(VER).tar.gz | gtar xpf - --no-same-owner
- gpatch -p0 < patch
- gpatch -p0 < patch.gcc.makefile.in
- gpatch -p0 < patch.gcc.configure
- gpatch -p0 < patch.intl.configure
- gpatch -p0 < patch.sol2.h
- gpatch -p0 < patch.i386.sol2-10.h
- gpatch -p0 < patch.g++spec.c
- gpatch -p0 < patch.c-parse.in
- touch $(VER)/configure
-
-$(VER)-i386-build:
- mkdir -p $@
-
-clean:
- -rm -rf $(VER) $(VER)-i386-build
-
-
-FRC:
View
BIN gcc/gcc-3.4.3.tar.gz
Binary file not shown.
View
329 gcc/install-sfw
@@ -1,329 +0,0 @@
-#! /usr/bin/sh
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-#
-#ident "@(#)install-sfw 1.21 09/06/04 SMI"
-#
-
-#
-# XXX - clean this up at some point
-
-. ../install.subr
-
-# The gcc makefiles install the stuff for us. We just need to clean
-# up the permissions, etc.
-
-SOL_REV=`uname -r | sed "s,^5\.,2\.,"`
-
-if [ "$MACH" = "sparc" ]; then
- MACHNAME=sparc-sun-solaris${SOL_REV}
-else
- MACHNAME=i386-pc-solaris${SOL_REV}
-fi
-
-GCCVER=3.4.3 # for easy updating
-
-# First, nuke the "fixincludes" headers that gcc installs.
-# We need to create these on the install machine at
-# package install time.
-# Except any files part of gcc, like the objc
-# include files. This could be automated but the list is
-# probably fairly static and smaller than the code to cleanup
-# what fixincludes might do.
-#
-# note gcc has its own stddef.h but when fixincludes is
-# run by pkgadd the system one replaces it (something
-# about wchar_t) so we don't ship that one for now.
-
-ls -d ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/include/* \
- | grep -v objc \
- | grep -v stdarg.h \
- | grep -v unwind.h \
- | grep -v emmintrin.h \
- | grep -v pmmintrin.h \
- | grep -v mmintrin.h \
- | grep -v iso646.h \
- | grep -v xmmintrin.h \
- | grep -v stdbool.h \
- | grep -v float.h \
- | xargs rm -rf
-
-# Nothing pretty here - just a brute-force changing of
-# all the perms. First the non-architecture-specific
-# pieces, then the architecture=specific stuff.
-
-
-# directories
-chmod 755 ${ROOT}/usr/sfw/include/c++
-chmod 755 ${ROOT}/usr/sfw/include/c++/${GCCVER}
-chmod 755 ${ROOT}/usr/sfw/include/c++/${GCCVER}/backward
-chmod 755 ${ROOT}/usr/sfw/include/c++/${GCCVER}/bits
-chmod 755 ${ROOT}/usr/sfw/include/c++/${GCCVER}/debug
-chmod 755 ${ROOT}/usr/sfw/include/c++/${GCCVER}/ext
-chmod 755 ${ROOT}/usr/sfw/lib/gcc
-chmod 755 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/include/objc
-chmod 755 ${ROOT}/usr/sfw/libexec/gcc
-
-# files
-
-for i in \
- gcc.info \
- cpp.info \
- gccint.info \
- gccinstall.info \
- g77.info \
- cppinternals.info
-do
- /usr/sfw/bin/install-info --dir-file=${ROOT}/usr/sfw/share/info/dir \
- ${ROOT}/usr/sfw/share/info/${i}
-done
-
-chmod 444 ${ROOT}/usr/sfw/share/info/gcc.info
-chmod 444 ${ROOT}/usr/sfw/share/info/cpp.info
-chmod 444 ${ROOT}/usr/sfw/share/info/gccint.info
-chmod 444 ${ROOT}/usr/sfw/share/info/gccinstall.info
-chmod 444 ${ROOT}/usr/sfw/share/info/cppinternals.info
-chmod 444 ${ROOT}/usr/sfw/share/info/g77.info
-
-chmod 555 ${ROOT}/usr/sfw/bin/gccbug
-
-for i in \
- c++ \
- cpp \
- g++ \
- gcc \
- g77 \
- gcov
-do
- chmod 755 ${ROOT}/usr/sfw/bin/${i}
- ${SRC}/tools/post_process ${ROOT}/usr/sfw/bin/${i}
- chmod 555 ${ROOT}/usr/sfw/bin/${i}
-done
-
-find ${ROOT}/usr/sfw/include/c++/${GCCVER} -type d -exec chmod 755 {} \;
-find ${ROOT}/usr/sfw/include/c++/${GCCVER} -type f -exec chmod 444 {} \;
-find ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/include -type f -exec chmod 444 {} \;
-
-for i in libgcc_s.so.1 libstdc++.so.6.0.3 libg2c.so.0.0.0 libobjc.so.1.0.0
-do
- chmod 755 ${ROOT}/usr/sfw/lib/${i}
- ${SRC}/tools/post_process_so ${ROOT}/usr/sfw/lib/${i}
- chmod 555 ${ROOT}/usr/sfw/lib/${i}
-done
-
-chmod 555 ${ROOT}/usr/sfw/lib/libiberty.a
-chmod 444 ${ROOT}/usr/sfw/lib/libstdc++.a
-chmod 555 ${ROOT}/usr/sfw/lib/libg2c.a
-chmod 555 ${ROOT}/usr/sfw/lib/libobjc.a
-chmod 555 ${ROOT}/usr/sfw/lib/libobjc.la
-chmod 555 ${ROOT}/usr/sfw/lib/libfrtbegin.a
-chmod 555 ${ROOT}/usr/sfw/lib/libg2c.la
-
-rm -f /tmp/sed$$
-echo "/^dependency_libs/c\\
-dependency_libs=' -L/usr/sfw/lib -lgcc_s -lm'" >/tmp/sed$$
-
-sed -f /tmp/sed$$ ${ROOT}/usr/sfw/lib/libstdc++.la > ${ROOT}/usr/sfw/lib/libstdc++.la.1
-mv ${ROOT}/usr/sfw/lib/libstdc++.la.1 ${ROOT}/usr/sfw/lib/libstdc++.la
-chmod 555 ${ROOT}/usr/sfw/lib/libstdc++.la
-
-sed -f /tmp/sed$$ ${ROOT}/usr/sfw/lib/libsupc++.la > ${ROOT}/usr/sfw/lib/libsupc++.la.1
-mv ${ROOT}/usr/sfw/lib/libsupc++.la.1 ${ROOT}/usr/sfw/lib/libsupc++.la
-chmod 555 ${ROOT}/usr/sfw/lib/libsupc++.la
-
-rm -f /tmp/sed$$
-
-chmod 555 ${ROOT}/usr/sfw/lib/libsupc++.a
-
-# arch-specific
-
-chmod 755 ${ROOT}/usr/sfw/include/c++/${GCCVER}/${MACHNAME}
-chmod 755 ${ROOT}/usr/sfw/include/c++/${GCCVER}/${MACHNAME}/bits
-chmod 755 ${ROOT}/usr/sfw/include/c++/${GCCVER}/${MACHNAME}/bits/stdc++.h.gch
-chmod 755 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}
-chmod 755 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}
-chmod 755 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/install-tools
-chmod 755 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/install-tools/include
-chmod 755 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/include
-chmod 755 ${ROOT}/usr/sfw/libexec/gcc/${MACHNAME}
-chmod 755 ${ROOT}/usr/sfw/libexec/gcc/${MACHNAME}/${GCCVER}
-chmod 755 ${ROOT}/usr/sfw/libexec/gcc/${MACHNAME}/${GCCVER}/install-tools
-
-for i in \
- ${MACHNAME}-c++ \
- ${MACHNAME}-g++ \
- ${MACHNAME}-gcc \
- ${MACHNAME}-gcc-${GCCVER}
-do
- chmod 755 ${ROOT}/usr/sfw/bin/${i}
- ${SRC}/tools/post_process ${ROOT}/usr/sfw/bin/${i}
- chmod 555 ${ROOT}/usr/sfw/bin/${i}
-done
-
-chmod 555 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/crtbegin.o
-chmod 555 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/crtend.o
-chmod 555 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/gmon.o
-
-chmod 444 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/install-tools/gsyslimits.h
-chmod 444 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/install-tools/include/README
-chmod 444 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/install-tools/include/float.h
-chmod 444 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/install-tools/include/iso646.h
-chmod 444 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/install-tools/include/limits.h
-chmod 444 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/install-tools/include/stdarg.h
-chmod 444 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/install-tools/include/stdbool.h
-chmod 444 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/install-tools/include/stddef.h
-chmod 444 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/install-tools/include/unwind.h
-chmod 444 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/install-tools/include/varargs.h
-chmod 444 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/install-tools/mkheaders.conf
-chmod 555 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/libgcc.a
-chmod 555 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/libgcc_eh.a
-chmod 555 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/libgcov.a
-chmod 444 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/specs
-
-for i in \
- cc1 \
- cc1obj \
- cc1plus \
- f771 \
- collect2
-do
- chmod 755 ${ROOT}/usr/sfw/libexec/gcc/${MACHNAME}/${GCCVER}/${i}
- ${SRC}/tools/post_process ${ROOT}/usr/sfw/libexec/gcc/${MACHNAME}/${GCCVER}/${i}
- chmod 555 ${ROOT}/usr/sfw/libexec/gcc/${MACHNAME}/${GCCVER}/${i}
-done
-
-
-for script in \
- ${ROOT}/usr/sfw/libexec/gcc/${MACHNAME}/${GCCVER}/install-tools/fixinc.sh \
- ${ROOT}/usr/sfw/libexec/gcc/${MACHNAME}/${GCCVER}/install-tools/mkheaders
-do
- rm -f ${script}.orig
- mv ${script} ${script}.orig
- sed \
- -e s,'^#!/bin/sh','#!/bin/ksh', \
- < ${script}.orig \
- > ${script}
- rm -f ${script}.orig
- chmod 555 ${script}
-done
-
-chmod 555 ${ROOT}/usr/sfw/libexec/gcc/${MACHNAME}/${GCCVER}/install-tools/fixincl
-
-if [ "$MACH" = "sparc" ]; then
- chmod 755 ${ROOT}/usr/sfw/lib/sparcv9
- rm -f ${ROOT}/usr/sfw/libexec/gcc/sparc-sun-solaris${SOL_REV}/${GCCVER}/as
- ln -s ../../../../../gnu/sparc-sun-solaris${SOL_REV}/bin/as ${ROOT}/usr/sfw/libexec/gcc/sparc-sun-solaris${SOL_REV}/${GCCVER}/as
- rm -f ${ROOT}/usr/sfw/lib/sparcv9/libgcc_s.so
- ln -s libgcc_s.so.1 ${ROOT}/usr/sfw/lib/sparcv9/libgcc_s.so
- chmod 555 ${ROOT}/usr/sfw/lib/sparcv9/libgcc_s.so.1
- chmod 555 ${ROOT}/usr/sfw/lib/sparcv9/libiberty.a
- chmod 555 ${ROOT}/usr/sfw/lib/sparcv9/libstdc++.a
- chmod 555 ${ROOT}/usr/sfw/lib/sparcv9/libg2c.a
- chmod 555 ${ROOT}/usr/sfw/lib/sparcv9/libfrtbegin.a
- chmod 555 ${ROOT}/usr/sfw/lib/sparcv9/libg2c.la
- chmod 555 ${ROOT}/usr/sfw/lib/sparcv9/libobjc.a
- chmod 555 ${ROOT}/usr/sfw/lib/sparcv9/libobjc.la
-
- rm -f /tmp/sed$$
- echo "/^dependency_libs/c\\
-dependency_libs=' -L/usr/sfw/lib/sparcv9 -lgcc_s -lm'" >/tmp/sed$$
-
- sed -f /tmp/sed$$ ${ROOT}/usr/sfw/lib/sparcv9/libstdc++.la > ${ROOT}/usr/sfw/lib/sparcv9/libstdc++.la.1
- mv ${ROOT}/usr/sfw/lib/sparcv9/libstdc++.la.1 ${ROOT}/usr/sfw/lib/sparcv9/libstdc++.la
- chmod 555 ${ROOT}/usr/sfw/lib/sparcv9/libstdc++.la
-
- sed -f /tmp/sed$$ ${ROOT}/usr/sfw/lib/sparcv9/libsupc++.la > ${ROOT}/usr/sfw/lib/sparcv9/libsupc++.la.1
- mv ${ROOT}/usr/sfw/lib/sparcv9/libsupc++.la.1 ${ROOT}/usr/sfw/lib/sparcv9/libsupc++.la
- chmod 555 ${ROOT}/usr/sfw/lib/sparcv9/libsupc++.la
- rm -f /tmp/sed$$
-
- chmod 555 ${ROOT}/usr/sfw/lib/sparcv9/libstdc++.so.6.0.3
- chmod 555 ${ROOT}/usr/sfw/lib/sparcv9/libsupc++.a
- chmod 555 ${ROOT}/usr/sfw/lib/sparcv9/libg2c.so.0.0.0
- chmod 555 ${ROOT}/usr/sfw/lib/sparcv9/libobjc.so.1.0.0
- chmod 755 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/sparcv9
- chmod 555 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/crt1.o
- chmod 555 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/crti.o
- chmod 555 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/crtn.o
- chmod 555 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/gcrt1.o
- chmod 555 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/sparcv9/crt1.o
- chmod 555 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/crtfastmath.o
- chmod 555 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/sparcv9/crti.o
- chmod 555 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/sparcv9/crtn.o
- chmod 555 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/sparcv9/gcrt1.o
- chmod 555 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/sparcv9/crtfastmath.o
- chmod 555 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/sparcv9/crtbegin.o
- chmod 555 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/sparcv9/crtend.o
- chmod 555 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/sparcv9/gmon.o
- chmod 555 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/sparcv9/libgcc.a
- chmod 555 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/sparcv9/libgcc_eh.a
- chmod 555 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/sparcv9/libgcov.a
-else
- chmod 755 ${ROOT}/usr/sfw/lib/amd64
- rm -f ${ROOT}/usr/sfw/libexec/gcc/i386-pc-solaris${SOL_REV}/${GCCVER}/as
- ln -s ../../../../../gnu/i386-pc-solaris${SOL_REV}/bin/as ${ROOT}/usr/sfw/libexec/gcc/i386-pc-solaris${SOL_REV}/${GCCVER}/as
- rm -f ${ROOT}/usr/sfw/lib/amd64/libgcc_s.so
- ln -s libgcc_s.so.1 ${ROOT}/usr/sfw/lib/amd64/libgcc_s.so
- chmod 555 ${ROOT}/usr/sfw/lib/amd64/libgcc_s.so.1
- chmod 555 ${ROOT}/usr/sfw/lib/amd64/libiberty.a
- chmod 555 ${ROOT}/usr/sfw/lib/amd64/libstdc++.a
- chmod 555 ${ROOT}/usr/sfw/lib/amd64/libg2c.a
- chmod 555 ${ROOT}/usr/sfw/lib/amd64/libg2c.la
- chmod 555 ${ROOT}/usr/sfw/lib/amd64/libobjc.a
- chmod 555 ${ROOT}/usr/sfw/lib/amd64/libobjc.la
- chmod 555 ${ROOT}/usr/sfw/lib/amd64/libfrtbegin.a
-
- rm -f /tmp/sed$$
- echo "/^dependency_libs/c\\
-dependency_libs=' -L/usr/sfw/lib/amd64 -lgcc_s -lm'" >/tmp/sed$$
- sed -f /tmp/sed$$ ${ROOT}/usr/sfw/lib/amd64/libstdc++.la > ${ROOT}/usr/sfw/lib/amd64/libstdc++.la.1
- mv ${ROOT}/usr/sfw/lib/amd64/libstdc++.la.1 ${ROOT}/usr/sfw/lib/amd64/libstdc++.la
- chmod 555 ${ROOT}/usr/sfw/lib/amd64/libstdc++.la
-sed -f /tmp/sed$$ ${ROOT}/usr/sfw/lib/amd64/libsupc++.la >${ROOT}/usr/sfw/lib/amd64/libsupc++.la.1
-
- mv ${ROOT}/usr/sfw/lib/amd64/libsupc++.la.1 ${ROOT}/usr/sfw/lib/amd64/libsupc++.la
- chmod 555 ${ROOT}/usr/sfw/lib/amd64/libsupc++.la
- rm -f /tmp/sed$$
-
- chmod 555 ${ROOT}/usr/sfw/lib/amd64/libstdc++.so.6.0.3
- chmod 555 ${ROOT}/usr/sfw/lib/amd64/libg2c.so.0.0.0
- chmod 555 ${ROOT}/usr/sfw/lib/amd64/libobjc.so.1.0.0
- chmod 555 ${ROOT}/usr/sfw/lib/amd64/libsupc++.a
- chmod 755 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/amd64
- chmod 555 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/amd64/crtbegin.o
- chmod 555 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/amd64/crtend.o
- chmod 555 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/amd64/gmon.o
- chmod 555 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/amd64/libgcc.a
- chmod 555 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/amd64/libgcc_eh.a
- chmod 555 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/amd64/libgcov.a
- chmod 444 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/install-tools/include/emmintrin.h
- chmod 444 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/install-tools/include/mmintrin.h
- chmod 444 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/install-tools/include/pmmintrin.h
- chmod 444 ${ROOT}/usr/sfw/lib/gcc/${MACHNAME}/${GCCVER}/install-tools/include/xmmintrin.h
-fi
-
-exit 0
View
19 gcc/patch
@@ -1,19 +0,0 @@
-*** gcc-3.4.3/gcc/version.c.orig Tue Nov 9 17:51:34 2004
---- gcc-3.4.3/gcc/version.c Tue Nov 9 17:52:08 2004
-***************
-*** 5,11 ****
- please modify this string to indicate that, e.g. by putting your
- organization's name in parentheses at the end of the string. */
-
-! const char version_string[] = "3.4.3";
-
- /* This is the location of the online document giving instructions for
- reporting bugs. If you distribute a modified version of GCC,
---- 5,11 ----
- please modify this string to indicate that, e.g. by putting your
- organization's name in parentheses at the end of the string. */
-
-! const char version_string[] = "3.4.3 (csl-sol210-3_4-20050802)";
-
- /* This is the location of the online document giving instructions for
- reporting bugs. If you distribute a modified version of GCC,
View
35 gcc/patch.c-parse.in
@@ -1,35 +0,0 @@
---- gcc-3.4.3/gcc/c-parse.in.orig Tue Feb 16 13:13:29 2010
-+++ gcc-3.4.3/gcc/c-parse.in Tue Feb 16 13:17:36 2010
-@@ -1730,7 +1730,7 @@
-
- structsp_attr:
- struct_head identifier '{'
-- { $$ = start_struct (RECORD_TYPE, $2);
-+ { $<ttype>$ = start_struct (RECORD_TYPE, $2);
- /* Start scope of tag before parsing components. */
- }
- component_decl_list '}' maybe_attribute
-@@ -1741,7 +1741,7 @@
- nreverse ($3), chainon ($1, $5));
- }
- | union_head identifier '{'
-- { $$ = start_struct (UNION_TYPE, $2); }
-+ { $<ttype>$ = start_struct (UNION_TYPE, $2); }
- component_decl_list '}' maybe_attribute
- { $$ = finish_struct ($<ttype>4, nreverse ($5),
- chainon ($1, $7)); }
-@@ -1750,12 +1750,12 @@
- nreverse ($3), chainon ($1, $5));
- }
- | enum_head identifier '{'
-- { $$ = start_enum ($2); }
-+ { $<ttype>$ = start_enum ($2); }
- enumlist maybecomma_warn '}' maybe_attribute
- { $$ = finish_enum ($<ttype>4, nreverse ($5),
- chainon ($1, $8)); }
- | enum_head '{'
-- { $$ = start_enum (NULL_TREE); }
-+ { $<ttype>$ = start_enum (NULL_TREE); }
- enumlist maybecomma_warn '}' maybe_attribute
- { $$ = finish_enum ($<ttype>3, nreverse ($4),
- chainon ($1, $7)); }
View
14 gcc/patch.g++spec.c
@@ -1,14 +0,0 @@
-*** gcc-3.4.3/gcc/cp/g++spec.c.orig Wed Nov 17 09:59:39 2004
---- gcc-3.4.3/gcc/cp/g++spec.c Mon Jan 28 13:40:34 2008
-***************
-*** 310,318 ****
- /* Add `-lstdc++' if we haven't already done so. */
- if (library > 0)
- {
-- arglist[j++] = saw_m64_flag
-- ? "-R" LIBDIR "/amd64"
-- : "-R" LIBDIR;
- arglist[j++] = saw_profile_flag ? LIBSTDCXX_PROFILE : LIBSTDCXX;
- added_libraries++;
- }
---- 310,315 ----
View
24 gcc/patch.gcc.configure
@@ -1,24 +0,0 @@
-*** gcc-3.4.3/gcc/configure.orig Mon May 4 08:48:35 2009
---- gcc-3.4.3/gcc/configure Mon May 4 08:59:16 2009
-***************
-*** 10539,10547 ****
- # arbitrary sections are supported and try the test.
- as_ver=`$gcc_cv_as --version 2>/dev/null | sed 1q`
- if echo "$as_ver" | grep GNU > /dev/null; then
-! as_ver=`echo $as_ver | sed -e 's/GNU assembler \([0-9.][0-9.]*\).*/\1/'`
-! as_major=`echo $as_ver | sed 's/\..*//'`
-! as_minor=`echo $as_ver | sed 's/[^.]*\.\([0-9]*\).*/\1/'`
- if test $as_major -eq 2 && test $as_minor -lt 11
- then :
- else gcc_cv_as_leb128=yes
---- 10539,10548 ----
- # arbitrary sections are supported and try the test.
- as_ver=`$gcc_cv_as --version 2>/dev/null | sed 1q`
- if echo "$as_ver" | grep GNU > /dev/null; then
-! as_vers=`echo $as_ver | sed -n \
-! -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*.*\)$,\1,p'`
-! as_major=`expr "$as_vers" : '\([0-9]*\)'`
-! as_minor=`expr "$as_vers" : '[0-9]*\.\([0-9]*\)'`
- if test $as_major -eq 2 && test $as_minor -lt 11
- then :
- else gcc_cv_as_leb128=yes
View
19 gcc/patch.gcc.makefile.in
@@ -1,19 +0,0 @@
-*** gcc-3.4.3/gcc/Makefile.in.orig Sat Oct 27 14:36:42 2007
---- gcc-3.4.3/gcc/Makefile.in Sat Oct 27 14:37:25 2007
-***************
-*** 3859,3865 ****
- # script does that.
- .po.gmo:
- -test -d po || mkdir po
-! $(GMSGFMT) --statistics -o $@ $<
-
- # The new .po has to be gone over by hand, so we deposit it into
- # build/po with a different extension.
---- 3859,3865 ----
- # script does that.
- .po.gmo:
- -test -d po || mkdir po
-! $(GMSGFMT) -o $@ $<
-
- # The new .po has to be gone over by hand, so we deposit it into
- # build/po with a different extension.
View
29 gcc/patch.i386.sol2-10.h
@@ -1,29 +0,0 @@
-*** gcc-3.4.3/gcc/config/i386/sol2-10.h.orig Wed Nov 17 09:59:39 2004
---- gcc-3.4.3/gcc/config/i386/sol2-10.h Mon Jan 28 13:39:30 2008
-***************
-*** 69,80 ****
- %{YP,*} \
- %{R*} \
- %{compat-bsd: \
-! %{!YP,*:%{p|pg:-Y P,/usr/ucblib/64:/usr/lib/libp/64:/lib/64:/usr/lib/64} \
-! %{!p:%{!pg:-Y P,/usr/ucblib/64:/lib:/usr/lib/64}}} \
-! -R /usr/ucblib/64} \
- %{!compat-bsd: \
-! %{!YP,*:%{p|pg:-Y P,/usr/lib/libp/64:/lib/64:/usr/lib/64} \
-! %{!p:%{!pg:-Y P,/lib/64:/usr/lib/64}}}}"
-
- #undef LINK_ARCH64_SPEC
- #define LINK_ARCH64_SPEC LINK_ARCH64_SPEC_BASE
---- 69,80 ----
- %{YP,*} \
- %{R*} \
- %{compat-bsd: \
-! %{!YP,*:%{p|pg:-Y P,/usr/ucblib/64:/usr/lib/libp/64:/lib/64:/usr/lib/64:/usr/sfw/lib/64 -R /usr/ucblib/64:/usr/lib/libp/64:/lib/64:/usr/lib/64:/usr/sfw/lib/64} \
-! %{!p:%{!pg:-Y P,/usr/ucblib/64:/lib/64:/usr/lib/64:/usr/sfw/lib/64 -R /usr/ucblib/64:/lib/64:/usr/lib/64:/usr/sfw/lib/64}}} \
-! } \
- %{!compat-bsd: \
-! %{!YP,*:%{p|pg:-Y P,/usr/lib/libp/64:/lib/64:/usr/lib/64:/usr/sfw/lib/64 -R /usr/lib/libp/64:/lib/64:/usr/lib/64:/usr/sfw/lib/64} \
-! %{!p:%{!pg:-Y P,/lib/64:/usr/lib/64:/usr/sfw/lib/64 -R /lib/64:/usr/lib/64:/usr/sfw/lib/64}}}}"
-
- #undef LINK_ARCH64_SPEC
- #define LINK_ARCH64_SPEC LINK_ARCH64_SPEC_BASE
View
40 gcc/patch.intl.configure
@@ -1,40 +0,0 @@
-*** gcc-3.4.3/intl/configure.orig Sat Oct 27 14:34:29 2007
---- gcc-3.4.3/intl/configure Sat Oct 27 14:35:17 2007
-***************
-*** 2779,2786 ****
- test -z "$ac_dir" && ac_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-! if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
-! (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
- ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext"
- break 2
- fi
---- 2779,2786 ----
- test -z "$ac_dir" && ac_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-! if $ac_dir/$ac_word /dev/null >/dev/null 2>&1 &&
-! (if $ac_dir/$ac_word /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
- ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext"
- break 2
- fi
-***************
-*** 2973,2980 ****
-
-
- if test "$GMSGFMT" != ":"; then
-! if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
-! (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
- : ;
- else
- GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
---- 2973,2980 ----
-
-
- if test "$GMSGFMT" != ":"; then
-! if $GMSGFMT /dev/null >/dev/null 2>&1 &&
-! (if $GMSGFMT /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
- : ;
- else
- GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
View
29 gcc/patch.sol2.h
@@ -1,29 +0,0 @@
-*** gcc-3.4.3/gcc/config/sol2.h.orig Thu Sep 23 00:27:08 2004
---- gcc-3.4.3/gcc/config/sol2.h Mon Jan 28 13:33:35 2008
-***************
-*** 130,141 ****
- %{YP,*} \
- %{R*} \
- %{compat-bsd: \
-! %{!YP,*:%{p|pg:-Y P,/usr/ucblib:/usr/ccs/lib/libp:/usr/lib/libp:/usr/ccs/lib:/usr/lib} \
-! %{!p:%{!pg:-Y P,/usr/ucblib:/usr/ccs/lib:/usr/lib}}} \
-! -R /usr/ucblib} \
- %{!compat-bsd: \
-! %{!YP,*:%{p|pg:-Y P,/usr/ccs/lib/libp:/usr/lib/libp:/usr/ccs/lib:/usr/lib} \
-! %{!p:%{!pg:-Y P,/usr/ccs/lib:/usr/lib}}}}"
-
- #undef LINK_ARCH32_SPEC
- #define LINK_ARCH32_SPEC LINK_ARCH32_SPEC_BASE
---- 130,141 ----
- %{YP,*} \
- %{R*} \
- %{compat-bsd: \
-! %{!YP,*:%{p|pg:-Y P,/usr/ucblib:/usr/ccs/lib/libp:/usr/lib/libp:/usr/ccs/lib:/lib:/usr/lib:/usr/sfw/lib -R /usr/ucblib:/usr/ccs/lib/libp:/usr/lib/libp:/usr/ccs/lib:/lib:/usr/lib:/usr/sfw/lib} \
-! %{!p:%{!pg:-Y P,/usr/ucblib:/usr/ccs/lib:/lib:/usr/lib:/usr/sfw/lib -R /usr/ucblib:/usr/ccs/lib:/lib:/usr/lib:/usr/sfw/lib}}} \
-! } \
- %{!compat-bsd: \
-! %{!YP,*:%{p|pg:-Y P,/usr/ccs/lib/libp:/usr/lib/libp:/usr/ccs/lib:/lib:/usr/lib:/usr/sfw/lib -R /usr/ccs/lib/libp:/usr/lib/libp:/usr/ccs/lib:/lib:/usr/lib:/usr/sfw/lib} \
-! %{!p:%{!pg:-Y P,/usr/ccs/lib:/lib:/usr/lib:/usr/sfw/lib -R /usr/ccs/lib:/lib:/usr/lib:/usr/sfw/lib}}}}"
-
- #undef LINK_ARCH32_SPEC
- #define LINK_ARCH32_SPEC LINK_ARCH32_SPEC_BASE
View
18 gcc4/Makefile
@@ -25,12 +25,12 @@
#
#
-# Copyright 2011 Joyent Inc.
+# Copyright 2012 Joyent Inc.
#
VER=gcc-4.4.4
-SFW_PATH="/opt/local/bin:/usr/sfw/bin:/usr/bin:/usr/ccs/bin:/opt/local/bin"
+SFW_PATH="/usr/ccs/bin:/opt/local/bin:/usr/sfw/bin:/usr/bin:/opt/local/bin"
BASE=$(PWD)
DESTDIR=$(BASE)/../proto
@@ -46,7 +46,7 @@ all: $(VER)-i386-build/config.status
MAKE=gmake gmake \
CFLAGS="-g -O2" \
STAGE1_CFLAGS="-g -O2" \
- CFLAGS_FOR_TARGET="-g -O2" -j128 bootstrap)
+ CFLAGS_FOR_TARGET="-g -O2" $(PARALLEL) bootstrap)
install: all
(cd $(VER)-i386-build; env - \
@@ -59,7 +59,7 @@ install: all
MAKE=gmake gmake \
CFLAGS="-g -O2" \
STAGE1_CFLAGS="-g -O2" \
- CFLAGS_FOR_TARGET="-g -O2" -j128 install)
+ CFLAGS_FOR_TARGET="-g -O2" $(PARALLEL) install)
$(VER)-i386-build/config.status: $(VER)-i386-build $(VER)/configure
(cd $(VER)-i386-build; env - \
@@ -69,12 +69,12 @@ $(VER)-i386-build/config.status: $(VER)-i386-build $(VER)/configure
PATH=$(SFW_PATH) \
MAKE=gmake \
../$(VER)/configure \
- --prefix=/usr/gcc4 \
- --with-as=/usr/sfw/bin/gas \
- --with-gnu-as \
+ --prefix=/usr/sfw \
--with-ld=/usr/ccs/bin/ld \
--without-gnu-ld \
- --enable-languages="c,c++,fortran" \
+ --with-gnu-as \
+ --with-as=/usr/gnu/bin/as \
+ --enable-languages="c,c++" \
--enable-shared \
--with-gmp=/opt/local \
--with-mpfr=/opt/local \
@@ -89,7 +89,7 @@ $(VER)-i386-build:
mkdir -p $@
clean:
- -rm -rf $(VER)-i386-build
+ -rm -rf $(VER) $(VER)-i386-build
FRC:
View
8 gnupg/Makefile
@@ -18,23 +18,23 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011 Joyent Inc.
+# Copyright (c) 2012 Joyent Inc.
#
VER=gnupg-1.4.11
BASE=$(PWD)
DESTDIR=$(BASE)/../proto
-GCC=/usr/bin/gcc
+GCC=$(DESTDIR)/usr/sfw/bin/gcc
all: $(VER)/config.status
( cd $(VER); \
- gmake CC=$(GCC))
+ gmake $(PARALLEL) CC=$(GCC))
install: all
mkdir -p $(DESTDIR)
( cd $(VER); \
- gmake CC=/usr/bin/gcc DESTDIR=$(DESTDIR) install)
+ gmake $(PARALLEL) CC=$(GCC) DESTDIR=$(DESTDIR) install)
clean:
rm -rf $(VER)
View
6 gtar/Makefile
@@ -18,18 +18,18 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2010 Joyent Inc.
+# Copyright (c) 2012 Joyent Inc.
#
VER=tar-1.23
BASE=$(PWD)
DESTDIR=$(BASE)/../proto
-CC=gcc
+CC=$(DESTDIR)/usr/sfw/bin/gcc
SH=ksh93
LD_OPTIONS="-M $(BASE)/mapfile_noexstk"
all: $(VER)/config.status
- (cd $(VER); env - CC=$(CC) LD_OPTIONS=$(LD_OPTIONS) PATH="/usr/perl5/bin:$(PATH)" gmake)
+ (cd $(VER); env - CC=$(CC) LD_OPTIONS=$(LD_OPTIONS) PATH="/usr/perl5/bin:$(PATH)" gmake $(PARALLEL))
install: all
mkdir -p $(DESTDIR)/usr/bin
View
10 gzip/Makefile
@@ -18,23 +18,25 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2010 Joyent Inc., All rights reserved.
+# Copyright (c) 2012 Joyent Inc., All rights reserved.
#
VER=gzip-1.3.5
BASE=$(PWD)
DESTDIR=$(BASE)/../proto
BINDIR=$(DESTDIR)/usr/bin
MANDIR=$(DESTDIR)/usr/share/man/man1
+GCC=$(DESTDIR)/usr/sfw/bin/gcc
all: $(VER)/config.status
( cd $(VER); env - PATH=$(PATH) \
- gmake )
+ CC=$(GCC) \
+ gmake $(PARALLEL) )
install: all
mkdir -p $(DESTDIR)
( cd $(VER); \
- gmake DESTDIR=$(DESTDIR) install)
+ gmake $(PARALLEL) DESTDIR=$(DESTDIR) install)
mv $(BINDIR)/zcmp $(BINDIR)/gzcmp
mv $(BINDIR)/zdiff $(BINDIR)/gzdiff
mv $(BINDIR)/zegrep $(BINDIR)/gzegrep
@@ -55,7 +57,7 @@ clean:
rm -rf $(VER)
$(VER)/config.status: $(VER)/configure
- (cd $(VER); ./configure --prefix=/usr)
+ (cd $(VER); CC=$(GCC) ./configure --prefix=/usr)
$(VER)/configure: $(VER).tar.gz
gtar -zxf $(VER).tar.gz
View
8 less/Makefile
@@ -18,23 +18,23 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2010 Joyent Inc.
+# Copyright (c) 2012 Joyent Inc.
#
VER=less-436
BASE=$(PWD)
DESTDIR=$(BASE)/../proto
-GCC=/usr/bin/gcc
+GCC=$(DESTDIR)/usr/sfw/bin/gcc
all: $(VER)/config.status
( cd $(VER); \
- gmake CC=$(GCC))
+ gmake $(PARALLEL) CC=$(GCC))
install: all
mkdir -p $(DESTDIR)
( cd $(VER); \
- gmake CC=/usr/bin/gcc DESTDIR=$(DESTDIR) install)
+ gmake $(PARALLEL) CC=$(GCC) DESTDIR=$(DESTDIR) install)
clean:
rm -rf $(VER)
View
23 libexpat/Makefile
@@ -26,13 +26,12 @@ VER64=$(VER)-64
LARGEFILES= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
BASE=$(PWD)
DESTDIR=$(BASE)/../proto
-CCSMAKE=/usr/ccs/bin/make
-CC=cc
-CCC=ccc
+CC=$(DESTDIR)/usr/sfw/bin/gcc
+CCC=$(DESTDIR)/usr/sfw/bin/g++
CC64=$(CC)
CCC64=$(CCC)
-CCFLAGS="-KPIC"
-CCFLAGS64="-m64 -KPIC"
+CCFLAGS="-fPIC"
+CCFLAGS64="-m64 -fPIC"
all: real-all
@@ -41,17 +40,15 @@ all32: $(VER)/config.status
CC=$(CC) CXX=$(CCC) \
"CFLAGS= -g -DHAVE_EXPAT_CONFIG_H $(LARGEFILES)" \
"INSTALL=/usr/ucb/install -c" \
- PATH=/opt/SUNWspro/bin:/usr/gnu/bin:$(PATH) \
- MAKE=$(CCSMAKE) $(CCSMAKE))
+ MAKE=gmake gmake $(PARALLEL))
@find . -name core -exec rm -f {} \;
all64: $(VER64)/config.status
(cd $(VER64); env \
"CC=$(CC64)" "CXX=$(CCC64)" \
"CFLAGS=$(CCFLAGS64) -g -DHAVE_EXPAT_CONFIG_H $(LARGEFILES)" \
"INSTALL=/usr/ucb/install -c" \
- PATH=/opt/SUNWspro/bin:/usr/gnu/bin:$(PATH) \
- MAKE=$(CCSMAKE) $(CCSMAKE))
+ MAKE=gmake gmake $(PARALLEL))
@find . -name core -exec rm -f {} \;
install: all
@@ -62,16 +59,14 @@ real-all: all32 all64
$(VER)/config.status: $(VER)/configure
(cd $(VER); env \
- PATH=/opt/SUNWspro/bin:/usr/gnu/bin:$(PATH) \
- CC=$(CC) CFLAGS=$(CCFLAGS) CXX=$(CCC) \
+ CC=$(CC) CFLAGS=$(CFLAGS) CXX=$(CCC) \
"INSTALL=/usr/ucb/install -c" \
- "MAKE=$(CCSMAKE)" \
+ "MAKE=gmake" \
./configure --prefix=/usr)
$(VER64)/config.status: $(VER64)/configure
(cd $(VER64); env \
- PATH=/opt/SUNWspro/bin:/usr/gnu/bin:$(PATH) \
- CC=$(CC64) CFLAGS=$(CCFLAGS64) CXX=$(CCC64) \
+ "CC=$(CC64)" "CFLAGS=$(CFLAGS64)" "CXX=$(CCC64)" \
"INSTALL=/usr/ucb/install -c" \
"MAKE=$(CCSMAKE)" \
./configure --prefix=/usr)
View
14 libidn/Makefile
@@ -18,35 +18,33 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011 Joyent Inc., All rights reserved.
+# Copyright (c) 2012 Joyent Inc., All rights reserved.
#
VER=libidn-1.11
LARGEFILES= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
BASE=$(PWD)
DESTDIR=$(BASE)/../proto
-CCSMAKE=/usr/ccs/bin/make
-CC=cc
-CCC=ccc
+MAKE=gmake
+CC=$(DESTDIR)/usr/sfw/bin/gcc
+CCC=$(DESTDIR)/usr/sfw/bin/g++
all: $(VER)/config.status
(cd $(VER); env \
CC=$(CC) CXX=$(CCC) \
"CFLAGS= -g $(LARGEFILES)" \
"INSTALL=/usr/ucb/install -c" \
- PATH=/opt/SUNWspro/bin:/usr/gnu/bin:$(PATH) \
- MAKE=$(CCSMAKE) $(CCSMAKE))
+ MAKE=$(MAKE) $(MAKE) $(PARALLEL))
@find . -name core -exec rm -f {} \;
install: all
DESTDIR=$(DESTDIR) /bin/bash ./install-sfw
$(VER)/config.status: $(VER)/configure
(cd $(VER); env \
- PATH=/opt/SUNWspro/bin:/usr/gnu/bin:$(PATH) \
CC=$(CC) CFLAGS=$(CFLAGS) CXX=$(CCC) \
"INSTALL=/usr/ucb/install -c" \
- "MAKE=$(CCSMAKE)" \
+ "MAKE=$(MAKE)" \
./configure)
$(VER)/configure: $(VER).tar.gz
View
24 libxml/Makefile
@@ -23,7 +23,7 @@
# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
-# Copyright (c) 2010 Joyent Inc.
+# Copyright (c) 2012 Joyent Inc.
# This makefile is unusual, because it builds both 32 and 64 bit
# versions of the library. The builds occur in separate subdirs,
@@ -38,22 +38,28 @@ LARGEFILES= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
BASE=$(PWD)
DESTDIR=$(BASE)/../proto
+GCC=$(DESTDIR)/usr/sfw/bin/gcc
+
-include ../Makefile.inc
all: real-all
all32: $(VER)/config.status
- (cd $(VER); env - PATH=$(PATH) "CFLAGS=$(LARGEFILES)" \
+ (cd $(VER); env - PATH=$(PATH) \
+ "CC=$(GCC)" \
+ "CFLAGS=$(LARGEFILES)" \
make -e libxml2.la; \
env - PATH=$(PATH) "CFLAGS=$(LARGEFILES)" \
- make -e)
+ "CC=$(GCC)" \
+ make -e $(PARALLEL))
all64: $(VER64)/config.status
- (cd $(VER64); env - PATH=$(PATH) "CC=cc" \
+ (cd $(VER64); env - PATH=$(PATH) "CC=$(GCC)" \
"CFLAGS=-m64 $(LARGEFILES)" \
make -e libxml2.la; \
env - PATH=$(PATH) "CFLAGS=-m64 $(LARGEFILES)" \
- make -e)
+ "CC=$(GCC)" \
+ make -e $(PARALLEL))
install: all
BASE=$(BASE) DESTDIR=$(DESTDIR) PATH=$(PATH) ksh93 ./install-libxml2 $(VER)
@@ -73,19 +79,19 @@ test64: all64
$(VER)/config.status: $(VER)/configure
(cd $(VER); \
- env - "CC=cc" "CFLAGS=$(LARGEFILES)" \
+ env - "CC=$(GCC)" "CFLAGS=$(LARGEFILES)" \
"LDFLAGS=$(LDFLAGS)" \
- "PATH=/opt/SUNWspro/bin:/usr/gnu/bin:$(PATH)" \
+ "PATH=$(DESTDIR)/usr/sfw/bin/:/usr/gnu/bin:$(PATH)" \
./configure --prefix=/usr --with-threads \
--without-python)
cp mapfile $(VER)/libxml2.syms
patch -N $(VER)/libtool < libtool.patch
$(VER64)/config.status: $(VER64)/configure
(cd $(VER64); \
- env - "CC=cc" "CFLAGS=-m64 $(LARGEFILES)" \
+ env - "CC=$(GCC)" "CFLAGS=-m64 $(LARGEFILES)" \
"LDFLAGS=$(LDFLAGS)" \
- "PATH=/opt/SUNWspro/bin:/usr/gnu/bin:$(PATH)" \
+ "PATH=$(DESTDIR)/usr/sfw/bin/:/usr/gnu/bin:$(PATH)" \
./configure --prefix=/usr --with-threads \
--without-python)
cp mapfile $(VER64)/libxml2.syms
View
23 libz/Makefile
@@ -23,7 +23,7 @@
# Use is subject to license terms.
#
-# Copyright (c) Joyent Inc
+# Copyright 2012 Joyent, Inc
# This makefile is unusual, because it builds both 32 and 64 bit
# versions of the library. The builds occur in separate subdirs,
@@ -35,24 +35,25 @@ VER64=$(VER)-64
BASE=$(PWD)
DESTDIR=$(BASE)/../proto
+GCC=$(DESTDIR)/usr/sfw/bin/gcc
all: real-all
all32: $(VER)/zconf.h
- (cd $(VER); env "CC=cc -KPIC" \
- "LDSHARED=cc -G -KPIC -h libz.so.1 -z defs -z text -z combreloc -M ../mapfile -L. -lc" \
- PATH=/opt/SUNWspro/bin:/usr/gnu/bin:$(PATH) \
- make -e)
+ (cd $(VER); env "CC=$(GCC) -fPIC" \
+ "LDSHARED=$(GCC) -shared -fPIC -Wl,-h,libz.so.1 -Wl,-z,defs -Wl,-z,text -Wl,-z,combreloc -Wl,-M,../mapfile -L. -lc" \
+ PATH=$(DESTDIR)/usr/sfw/bin/:$(PATH) \
+ make -e $(PARALLEL))
# must override LDSHARED here, or the makefile uses the wrong
# flags and tries to run the linker in 32-bit mode...libtool
# isn't looking so bad after all...sigh.
all64: $(VER64)/zconf.h
- (cd $(VER64); env "CC=cc" "CFLAGS=-m64 -KPIC" \
- "LDSHARED=cc -m64 -G -KPIC -h libz.so.1 -z defs -z text -z combreloc -M ../mapfile -L. -lc" \
- PATH=/opt/SUNWspro/bin:/usr/gnu/bin:$(PATH) \
- make -e)
+ (cd $(VER64); env "CC=$(GCC) -m64 -fPIC" \
+ "LDSHARED=$(GCC) -m64 -shared -fPIC -Wl,-h,libz.so.1 -Wl,-z,defs -Wl,-z,text -Wl,-z,combreloc -Wl,-M,../mapfile -L. -lc" \
+ PATH=$(DESTDIR)/usr/sfw/bin/:$(PATH) \
+ make -e $(PARALLEL))
install: all
BASE=$(BASE) DESTDIR=$(DESTDIR) ksh93 ./install-zlib
@@ -62,7 +63,7 @@ real-all: all32 all64
$(VER)/zconf.h: $(VER)/configure
(cd $(VER); env \
- PATH=/opt/SUNWspro/bin:/usr/gnu/bin:$(PATH) \
+ PATH=$(DESTDIR)/usr/sfw/bin/:$(PATH) \
./configure --shared \
--prefix=/usr)
@@ -73,7 +74,7 @@ $(VER)/zconf.h: $(VER)/configure
$(VER64)/zconf.h: $(VER64)/configure
(cd $(VER64); env \
- PATH=/opt/SUNWspro/bin:/usr/gnu/bin:$(PATH) \
+ PATH=$(DESTDIR)/usr/sfw/bin/:$(PATH) CC=$(GCC)\
./configure --shared \
--prefix=/usr)
View
22 manifest
@@ -62,12 +62,12 @@ f usr/share/man/man1/bzip2.1 0444 root bin
f usr/share/man/man1/bzip2recover.1 0444 root bin
f usr/share/man/man1/bzless.1 0444 root bin
f usr/share/man/man1/bzmore.1 0444 root bin
+d usr/include 0755 root bin
+f usr/include/bzlib.h 0644 root bin
f usr/lib/amd64/libbz2.so.1 0755 root bin
s usr/lib/amd64/libbz2.so=libbz2.so.1
f usr/lib/libbz2.so.1 0755 root bin
s usr/lib/libbz2.so=libbz2.so.1
-d usr/include 0755 root bin
-f usr/include/bzlib.h 0644 root bin
# curl
f usr/lib/libcurl.so.4.2.0 0755 root bin
s usr/lib/libcurl.so.4=libcurl.so.4.2.0
@@ -99,14 +99,20 @@ f usr/lib/iconv/UTF-8%646.so 0755 root bin
f usr/sfw/lib/amd64/libgcc_s.so.1 0555 root bin
s usr/sfw/lib/amd64/libgcc_s.so=libgcc_s.so.1
s usr/sfw/lib/amd64/libgcc_s_amd64.so=libgcc_s.so.1
-f usr/sfw/lib/amd64/libstdc++.so.6.0.3 0555 root bin
-s usr/sfw/lib/amd64/libstdc++.so.6=libstdc++.so.6.0.3
-s usr/sfw/lib/amd64/libstdc++.so=libstdc++.so.6.0.3
+f usr/sfw/lib/amd64/libstdc++.so.6.0.13 0555 root bin
+s usr/sfw/lib/amd64/libstdc++.so.6=libstdc++.so.6.0.13
+s usr/sfw/lib/amd64/libstdc++.so=libstdc++.so.6.0.13
f usr/sfw/lib/libgcc_s.so.1 0555 root bin
s usr/sfw/lib/libgcc_s.so=libgcc_s.so.1
-f usr/sfw/lib/libstdc++.so.6.0.3 0555 root bin
-s usr/sfw/lib/libstdc++.so.6=libstdc++.so.6.0.3
-s usr/sfw/lib/libstdc++.so=libstdc++.so.6.0.3
+f usr/sfw/lib/libstdc++.so.6.0.13 0555 root bin
+s usr/sfw/lib/libstdc++.so.6=libstdc++.so.6.0.13
+s usr/sfw/lib/libstdc++.so=libstdc++.so.6.0.13
+f usr/sfw/lib/libssp.so.0.0.0 0555 root bin
+s usr/sfw/lib/libssp.so.0=libssp.so.0.0.0
+s usr/sfw/lib/libssp.so=libssp.so.0
+f usr/sfw/lib/amd64/libssp.so.0.0.0 0555 root bin
+s usr/sfw/lib/amd64/libssp.so.0=libssp.so.0.0.0
+s usr/sfw/lib/amd64/libssp.so=libssp.so.0
# gnupg
f usr/bin/gpg 0555 root bin
# gtar
View
25 ncurses/Makefile
@@ -18,20 +18,23 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2010 Joyent Inc., All rights reserved.
+# Copyright (c) 2012 Joyent Inc., All rights reserved.
#
VER=ncurses-5.7
VER64=$(VER)-64
BASE=$(PWD)
DESTDIR=$(BASE)/../proto
USRDIR=$(DESTDIR)/usr
+GCC=$(DESTDIR)/usr/sfw/bin/gcc
all: $(VER)/config.status $(VER64)/config.status
- ( cd $(VER); env - PATH=$(PATH) \
- gmake )
- ( cd $(VER64); env - PATH=$(PATH) \
- gmake )
+ ( cd $(VER); env - PATH=$(DESTDIR)/usr/sfw/bin:/usr/bin:$(PATH) \
+ CC=$(GCC) \
+ gmake $(PARALLEL) )
+ ( cd $(VER64); env - PATH=$(DESTDIR)/usr/sfw/bin:/usr/bin:$(PATH) \
+ CC=$(GCC) \
+ gmake $(PARALLEL))
install: all
mkdir -p $(DESTDIR)
@@ -54,17 +57,21 @@ clean:
rm -rf $(VER) $(VER64)
$(VER)/config.status: $(VER)/configure
- (cd $(VER); ./configure --prefix=/usr/gnu -C --with-shared --without-normal)
+ (cd $(VER); \
+ CC=$(GCC) \
+ ./configure --prefix=/usr/gnu -C --with-shared --without-normal)
$(VER64)/config.status: $(VER64)/configure
- (cd $(VER64); ./configure --prefix=/usr/gnu --libdir=/usr/gnu/lib/amd64 -C --with-shared --without-normal)
+ (cd $(VER64); \
+ CC=$(GCC) \
+ ./configure --prefix=/usr/gnu --libdir=/usr/gnu/lib/amd64 -C --with-shared --without-normal)
$(VER)/configure: $(VER64)/configure
gtar -zxf $(VER).tar.gz
(cd $(VER) \
; gpatch -p1 --no-backup-if-mismatch < ../ncurses-01-widec.diff \
; gpatch -p1 --no-backup-if-mismatch < ../ncurses-02-rpath.diff \
- )
+ )
touch $(VER)/configure
$(VER64)/configure: $(VER).tar.gz
@@ -73,6 +80,6 @@ $(VER64)/configure: $(VER).tar.gz
(cd $(VER64) \
; gpatch -p1 --no-backup-if-mismatch < ../ncurses-01-widec.diff \
; gpatch -p1 --no-backup-if-mismatch < ../ncurses-02-rpath.diff \
- )
+ )
touch $(VER64)/configure
View
9 node.js/Makefile
@@ -18,25 +18,24 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2010,2011 Joyent Inc.
+# Copyright 2012 Joyent, Inc.
#
VER=node-v0.6.9
BASE=$(PWD)
DESTDIR=$(BASE)/../proto
-GCC=/usr/bin/gcc
-PATH=/sbin:/usr/sbin:/usr/bin:/opt/SUNWspro/bin
+GCC=$(DESTDIR)/usr/sfw/bin/gcc
-include ../Makefile.inc
all: $(VER)/build/default/config.h
( cd $(VER); \
- gmake CC=$(GCC))
+ gmake $(PARALLEL) CC=$(GCC))
install: all
mkdir -p $(DESTDIR)
( cd $(VER); \
- gmake CC=$(GCC) DESTDIR=$(DESTDIR) install)
+ gmake $(PARALLEL) CC=$(GCC) DESTDIR=$(DESTDIR) install)
clean:
rm -rf $(VER)
View
4 nss-nspr/Makefile
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2010 Joyent Inc.
+# Copyright (c) 2012 Joyent Inc.
#
VER=nss-3.12.8
@@ -31,10 +31,12 @@ all: real-all
all32: $(VER)/.stamp
@ (cd $(VER)/mozilla/security/nss; \
+ PATH=$(DESTDIR)/usr/sfw/bin:/sbin:/usr/sbin:/usr/bin:/opt/local/bin \
gmake BUILD_OPT=1 NS_USE_GCC=1 NO_MDUPDATE=1 nss_build_all )
all64: $(VER64)/.stamp
@ (cd $(VER64)/mozilla/security/nss; \
+ PATH=$(DESTDIR)/usr/sfw/bin:/sbin:/usr/sbin:/usr/bin:/opt/local/bin \
gmake USE_64=1 BUILD_OPT=1 NS_USE_GCC=1 NO_MDUPDATE=1 nss_build_all )
install: all
View
2 nss-nspr/install-nss
@@ -59,6 +59,6 @@ _install N lib/libplds4.so ${PREFIX}/libplds4.so 555
_install N bin/certutil ${BIN_PREFIX}/certutil 555
-cp -pr ${ROOT}/${VERS}/mozilla/dist/SunOS5.11_i86pc_gcc_OPT.OBJ/include/* \
+cp -Lpr ${ROOT}/${VERS}/mozilla/dist/SunOS5.11_i86pc_gcc_OPT.OBJ/include/* \
${INC_PREFIX}
cp ${ROOT}/${VERS}/mozilla/dist/public/nss/* ${INC_PREFIX}
View
20 ntp/Makefile
@@ -21,7 +21,8 @@
#
# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2011 Joyent Inc
+#
+# Copyright 2012 Joyent Inc
#
@@ -47,23 +48,26 @@ CONFIGURE_OPTIONS += --without-lineeditlibs
CONFIGURE_OPTIONS += --with-openssl-libdir=/lib
CONFIGURE_OPTIONS += --disable-getifaddrs
-TARGET_ENV = CC="gcc"
-TARGET_ENV += CFLAGS="-O2"
-TARGET_ENV += LD_OPTIONS="-L${DESTDIR}/usr/lib -L/usr/lib -R/usr/lib"
+TARGET_ENV = CC="$(DESTDIR)/usr/sfw/bin/gcc"
+TARGET_ENV += CFLAGS="-O2"
+TARGET_ENV += LD_OPTIONS="-L${DESTDIR}/usr/lib -L/usr/lib -R/usr/lib"
TARGET_ENV += DESTDIR=$(DESTDIR)
+TARGET_ENV += MAKE=gmake
all: $(VER)/config.status
- (cd $(VER); env - $(TARGET_ENV) gmake all)
+ (cd $(VER); env - $(TARGET_ENV) gmake $(PARALLEL) all)
install: all
- (cd $(VER); env - $(TARGET_ENV) gmake install)
+ (cd $(VER); env - $(TARGET_ENV) gmake $(PARALLEL) install)
(env - $(TARGET_ENV) ./install-ntp)
$(VER)/config.status: clean $(VER)/.patched
- (cd $(VER) ; env - PATH_PERL=/usr/perl5/bin/perl bash ./configure $(CONFIGURE_OPTIONS) $(TARGET_ENV))
+ (cd $(VER) ; env - PATH_PERL=/usr/perl5/bin/perl \
+ bash ./configure $(CONFIGURE_OPTIONS) $(TARGET_ENV))
$(VER)/.patched: $(VER)
- (cd $(VER) ; env - ; for x in ../Patches/*; do gpatch -p0 < $$x; done ; touch .patched)
+ (cd $(VER) ; env - ; for x in ../Patches/*; \
+ do gpatch -p0 < $$x; done ; touch .patched)
$(VER):
gtar -zxf $(TARBALL)
View
12 openldap/Makefile
@@ -18,26 +18,26 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011 Joyent Inc.
+# Copyright 2012 Joyent, Inc.
#
VER=openldap-2.4.26
BASE=$(PWD)
DESTDIR=$(BASE)/../proto
-GCC=/usr/bin/gcc
-PATH=/sbin:/usr/sbin:/usr/bin
-MAKE=/opt/local/bin/make
+CC=$(DESTDIR)/usr/sfw/bin/gcc
+PATH=$(DESTDIR)/usr/sfw/bin:/sbin:/usr/sbin:/usr/bin
+MAKE=gmake
LDFLAGS=-Wl,-R/usr/openldap/lib -Wl,-R/lib -Wl,-R/usr/lib -Wl,-R/usr/sfw/lib
-include ../Makefile.inc
all: $(VER)/config.h
- ( cd $(VER); gmake)
+ ( cd $(VER); gmake $(PARALLEL))
install: all
mkdir -p $(DESTDIR)
( cd $(VER); XLDFLAGS="$(LDFLAGS)" \
- gmake DESTDIR=$(DESTDIR) install)
+ gmake $(PARALLEL) DESTDIR=$(DESTDIR) install)
clean:
rm -rf $(VER)
View
10 openssl/Makefile
@@ -22,7 +22,7 @@
#
# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# Copyright (c) 2010 Joyent Inc.
+# Copyright (c) 2012 Joyent Inc.
#
VERSION=0.9.8o
@@ -41,25 +41,25 @@ all: all32 all64
all32: $(VER)/$(CONFIG_STATUS)
cd $(VER); env - PATH=$(PATH) \
"CFLAGS=$(CFLAGS)" \
- gmake
+ gmake
all64: $(VER64)/$(CONFIG_STATUS)
cd $(VER64); env - PATH=$(PATH) \
"CFLAGS=$(CFLAGS)" \
- gmake
+ gmake
# opensslconf.h is patched to ensure suitability for both 64bit and 32bit
$(VER)/$(CONFIG_STATUS): $(VER)/configure
cd $(VER); env - PATH=$(PATH) \
ksh93 ./Configure $(CONFIGURE_OPTIONS)
gpatch -p1 $(VER)/crypto/opensslconf.h opensslconf.patch
- cd $(VER); gmake depend
+ cd $(VER); gmake depend
touch $@
$(VER64)/$(CONFIG_STATUS): $(VER)/configure
cd $(VER64); env - PATH=$(PATH) \
ksh93 ./Configure $(CONFIGURE_OPTIONS64)
- cd $(VER64); gmake depend
+ cd $(VER64); gmake depend
touch $@
install: all install32 install64
View
4 openssl/Makefile.com
@@ -65,12 +65,12 @@ GENERIC_CONFIGURE_OPTIONS = \
threads \
shared
-CONFIGURE_OPTIONS64_i386 = solaris64-x86_64-cc-sunw
+CONFIGURE_OPTIONS64_i386 = solaris64-x86_64-gcc
CONFIGURE_OPTIONS64 = $(GENERIC_CONFIGURE_OPTIONS) \
$(CONFIGURE_OPTIONS64_i386) \
--pk11-libname=$(PKCS11_LIB64)
-CONFIGURE_OPTIONS_i386 = solaris-x86-cc-sunw
+CONFIGURE_OPTIONS_i386 = solaris-x86-gcc
CONFIGURE_OPTIONS = $(GENERIC_CONFIGURE_OPTIONS) \
$(CONFIGURE_OPTIONS_i386) \
--pk11-libname=$(PKCS11_LIB)
View
41 perl/Makefile
@@ -1,26 +1,53 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2012 Joyent, Inc
+#
VER = perl-5.12.3
TARBALL=$(VER).tar.gz
+BASE=$(PWD)
+DESTDIR=$(BASE)/../proto
+
+GCC=$(DESTDIR)/usr/sfw/bin/gcc
+
all: $(VER)/perldtrace.h
- (cd $(VER); gmake )
+ (cd $(VER); LC_ALL=C gmake)
test: all
- (cd $(VER); gmake test)
+ (cd $(VER); gmake test)
install: all
(cd $(VER);\
- rm -f ${ROOT}/usr/perl5/5.12/lib/i86pc-solaris-64int/.packlist;\
- DESTDIR=${ROOT} \
- gmake install)
+ rm -f $(DESTDIR)/usr/perl5/5.12/lib/i86pc-solaris-64int/.packlist;\
+ DESTDIR=$(DESTDIR) \
+ gmake install)
$(VER):
gtar -zxf $(TARBALL)
$(VER)/cflags: $(VER)
(cd $(VER) && \
- cp -f ../config.sh ./config.sh && \
- ./Configure -S )
+ cp -f ../config.over ./config.over && \
+ PATH=/usr/bin:/usr/sbin:/usr/sfw/bin:$(PATH) \
+ ./Configure -des -Dcc=$(GCC) )
$(VER)/perldtrace.h: $(VER)/cflags
(cd $(VER) && \
View
72 perl/config.over
@@ -0,0 +1,72 @@
+#!/bin/sh
+archlib='/usr/perl5/5.12/lib/i86pc-solaris-64int'
+archlibexp='/usr/perl5/5.12/lib/i86pc-solaris-64int'
+archname64='64int'
+archname='i86pc-solaris-64int'
+bin='/usr/perl5/5.12/bin'
+binexp='/usr/perl5/5.12/bin'
+cf_by='Joyent'
+cf_email='bugs@illumos.org'
+initialinstalllocation='/usr/perl5/5.12/bin'
+installarchlib='/usr/perl5/5.12/lib/i86pc-solaris-64int'
+installbin='/usr/perl5/5.12/bin'
+installhtml1dir=''
+installhtml3dir=''
+installman1dir='/usr/perl5/5.12/man/man1'
+installman3dir='/usr/perl5/5.12/man/man3'
+installprefix='/usr/perl5/5.12'
+installprefixexp='/usr/perl5/5.12'
+installprivlib='/usr/perl5/5.12/lib'
+installscript='/usr/perl5/5.12/bin'
+installsitearch='/usr/perl5/site_perl/5.12/i86pc-solaris-64int'
+installsitebin='/usr/perl5/5.12/bin'
+installsitehtml1dir=''
+installsitehtml3dir=''
+installsitelib='/usr/perl5/site_perl/5.12'
+installsiteman1dir='/usr/perl5/5.12/man/man1'
+installsiteman3dir='/usr/perl5/5.12/man/man3'
+installsitescript='/usr/perl5/5.12/bin'
+installstyle='lib'
+installusrbinperl='undef'
+man1dir='/usr/perl5/5.12/man/man1'
+man1direxp='/usr/perl5/5.12/man/man1'
+man1ext='1'
+man3dir='/usr/perl5/5.12/man/man3'
+man3direxp='/usr/perl5/5.12/man/man3'
+man3ext='3'
+mips_type=''
+myarchname='i86pc-solaris'
+mydomain='.illumos.org'
+myhostname='illumos'
+package='perl5'
+perl5='/usr/bin/perl'
+perladmin='bugs@illumos.org'
+perlpath='/usr/perl5/5.12/bin/perl'
+prefix='/usr/perl5/5.12'
+prefixexp='/usr/perl5/5.12'
+privlib='/usr/perl5/5.12/lib'
+privlibexp='/usr/perl5/5.12/lib'
+scriptdir='/usr/perl5/5.12/bin'
+scriptdirexp='/usr/perl5/5.12/bin'
+sitearch='/usr/perl5/site_perl/5.12/i86pc-solaris-64int'
+sitearchexp='/usr/perl5/site_perl/5.12/i86pc-solaris-64int'
+sitebin='/usr/perl5/5.12/bin'
+sitebinexp='/usr/perl5/5.12/bin'
+sitehtml1dir=''
+sitehtml1direxp=''
+sitehtml3dir=''
+sitehtml3direxp=''
+sitelib='/usr/perl5/site_perl/5.12'
+sitelib_stem='/usr/perl5/site_perl/5.12'
+sitelibexp='/usr/perl5/site_perl/5.12'
+siteman1dir='/usr/perl5/5.12/man/man1'
+siteman1direxp='/usr/perl5/5.12/man/man1'
+siteman3dir='/usr/perl5/5.12/man/man3'
+siteman3direxp='/usr/perl5/5.12/man/man3'
+siteprefix='/usr/perl5/5.12'
+siteprefixexp='/usr/perl5/5.12'
+sitescript='/usr/perl5/5.12/bin'
+sitescriptexp='/usr/perl5/5.12/bin'
+startperl='#!/usr/perl5/5.12/bin/perl'
+dtrace='/usr/sbin/dtrace'
+usedtrace='define'
View
1,095 perl/config.sh
@@ -1,1095 +0,0 @@
-#!/bin/sh
-#
-# This file was produced by running the Configure script. It holds all the
-# definitions figured out by Configure. Should you modify one of these values,
-# do not forget to propagate your changes by running "Configure -der". You may
-# instead choose to run each of the .SH files by yourself, or "Configure -S".
-#
-
-# Package name : perl5
-# Source directory : .
-# Configuration time: Sun Mar 13 15:56:54 PDT 2011
-# Configured by : john
-# Target system : sunos pandaemonium 5.11 oi_147 i86pc i386 i86pc
-
-: Configure command line arguments.
-config_arg0='./Configure'
-config_args=''
-config_argc=0
-
-Author=''
-Date='$Date'
-Header=''
-Id='$Id'
-Locker=''
-Log='$Log'
-RCSfile='$RCSfile'
-Revision='$Revision'
-Source=''
-State=''
-_a='.a'
-_exe=''
-_o='.o'
-afs='false'
-afsroot='/afs'
-alignbytes='4'
-ansi2knr=''
-aphostname='/usr/bin/hostname'
-api_revision='5'
-api_subversion='0'
-api_version='12'
-api_versionstring='5.12.0'
-ar='ar'
-archlib='/usr/perl5/5.12/lib/i86pc-solaris-64int'
-archlibexp='/usr/perl5/5.12/lib/i86pc-solaris-64int'
-archname64='64int'
-archname='i86pc-solaris-64int'
-archobjs=''
-asctime_r_proto='0'
-awk='awk'
-baserev='5.0'
-bash=''
-bin='/usr/perl5/5.12/bin'
-bin_ELF='define'
-binexp='/usr/perl5/5.12/bin'
-bison='bison'
-byacc='byacc'
-byteorder='12345678'
-c='\c'
-castflags='0'
-cat='cat'
-cc='/opt/SUNWspro/bin/cc'
-cccdlflags='-KPIC'
-ccdlflags=' '
-ccflags=' -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
-ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
-ccname='/opt/SUNWspro/bin/cc'
-ccsymbols=''
-ccversion='Sun C 5.9 SunOS_i386 Patch 124868-10 2009/04/30'
-cf_by='john'
-cf_email='bugs@illumos.org'
-cf_time='Sun Mar 13 15:56:54 PDT 2011'
-charbits='8'
-charsize='1'
-chgrp=''
-chmod='chmod'
-chown=''
-clocktype='clock_t'
-comm='comm'
-compress=''
-contains='grep'
-cp='cp'
-cpio=''
-cpp='cpp'
-cpp_stuff='42'
-cppccsymbols=''
-cppflags=''
-cpplast='-'
-cppminus='-'
-cpprun='/opt/SUNWspro/bin/cc -E'
-cppstdin='/opt/SUNWspro/bin/cc -E'
-cppsymbols='_FILE_OFFSET_BITS=64 i386=1 __i386=1 _ILP32= _LARGEFILE_SOURCE=1 _LARGEFILE64_SOURCE=1 _LITTLE_ENDIAN= __STDC__=0 sun=1 __sun=1 __SVR4=1 unix=1 __unix=1'
-crypt_r_proto='0'
-cryptlib=''
-csh='csh'
-ctermid_r_proto='0'
-ctime_r_proto='0'
-d_Gconvert='gconvert((x),(n),(t),(b))'
-d_PRIEUldbl='define'
-d_PRIFUldbl='define'
-d_PRIGUldbl='define'
-d_PRIXU64='define'
-d_PRId64='define'
-d_PRIeldbl='define'
-d_PRIfldbl='define'
-d_PRIgldbl='define'
-d_PRIi64='define'
-d_PRIo64='define'
-d_PRIu64='define'
-d_PRIx64='define'
-d_SCNfldbl='define'
-d__fwalk='undef'
-d_access='define'
-d_accessx='undef'
-d_aintl='undef'
-d_alarm='define'
-d_archlib='define'
-d_asctime64='undef'
-d_asctime_r='undef'
-d_atolf='undef'
-d_atoll='define'
-d_attribute_deprecated='undef'
-d_attribute_format='undef'
-d_attribute_malloc='define'
-d_attribute_nonnull='define'
-d_attribute_noreturn='define'
-d_attribute_pure='define'
-d_attribute_unused='define'
-d_attribute_warn_unused_result='undef'
-d_bcmp='define'
-d_bcopy='define'
-d_bsd='undef'
-d_bsdgetpgrp='undef'
-d_bsdsetpgrp='undef'
-d_builtin_choose_expr='undef'
-d_builtin_expect='undef'
-d_bzero='define'
-d_c99_variadic_macros='define'
-d_casti32='undef'
-d_castneg='define'
-d_charvspr='undef'
-d_chown='define'
-d_chroot='define'
-d_chsize='undef'
-d_class='undef'
-d_clearenv='define'
-d_closedir='define'
-d_cmsghdr_s='define'
-d_const='define'
-d_copysignl='define'
-d_cplusplus='undef'
-d_crypt='define'
-d_crypt_r='undef'
-d_csh='define'
-d_ctermid='define'
-d_ctermid_r='undef'
-d_ctime64='undef'
-d_ctime_r='undef'
-d_cuserid='define'
-d_dbl_dig='define'
-d_dbminitproto='undef'
-d_difftime64='undef'
-d_difftime='define'
-d_dir_dd_fd='define'
-d_dirfd='define'
-d_dirnamlen='undef'
-d_dlerror='define'
-d_dlopen='define'
-d_dlsymun='undef'
-d_dosuid='undef'
-d_drand48_r='undef'
-d_drand48proto='define'
-d_dup2='define'
-d_eaccess='undef'
-d_endgrent='define'
-d_endgrent_r='undef'
-d_endhent='define'
-d_endhostent_r='undef'
-d_endnent='define'
-d_endnetent_r='undef'
-d_endpent='define'
-d_endprotoent_r='undef'
-d_endpwent='define'
-d_endpwent_r='undef'
-d_endsent='define'
-d_endservent_r='undef'
-d_eofnblk='define'
-d_eunice='undef'
-d_faststdio='define'
-d_fchdir='define'
-d_fchmod='define'
-d_fchown='define'
-d_fcntl='define'
-d_fcntl_can_lock='define'
-d_fd_macros='define'
-d_fd_set='define'
-d_fds_bits='define'
-d_fgetpos='define'
-d_finite='define'
-d_finitel='undef'
-d_flexfnam='define'
-d_flock='undef'
-d_flockproto='undef'
-d_fork='define'
-d_fp_class='undef'
-d_fpathconf='define'
-d_fpclass='define'
-d_fpclassify='undef'
-d_fpclassl='undef'
-d_fpos64_t='define'
-d_frexpl='define'
-d_fs_data_s='undef'
-d_fseeko='define'
-d_fsetpos='define'
-d_fstatfs='define'
-d_fstatvfs='define'
-d_fsync='define'
-d_ftello='define'
-d_ftime='undef'
-d_futimes='undef'
-d_gdbm_ndbm_h_uses_prototypes='undef'
-d_gdbmndbm_h_uses_prototypes='undef'
-d_getaddrinfo='define'
-d_getcwd='define'
-d_getespwnam='undef'
-d_getfsstat='undef'
-d_getgrent='define'
-d_getgrent_r='undef'
-d_getgrgid_r='undef'
-d_getgrnam_r='undef'
-d_getgrps='define'
-d_gethbyaddr='define'
-d_gethbyname='define'
-d_gethent='define'
-d_gethname='define'
-d_gethostbyaddr_r='undef