Permalink
Browse files

OS-1081 /usr/gnu contents are severely broken wrt ISA

OS-1121 platform delivers unwanted compilation symlinks
OS-1123 libstdc++ and libgcc_s should move to /usr
OS-1172 certutil and other nspr artifacts are missing RPATH entries
  • Loading branch information...
1 parent 78c2b2b commit 9186f510896982fe88920c037ab59fe91cf4857d Keith M Wesolowski committed May 9, 2012
View
@@ -25,7 +25,7 @@
BASE=$(PWD)
DESTDIR=$(BASE)/proto
-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
+PATH=$(DESTDIR)/usr/bin:/usr/sfw/bin:/usr/gnu/bin:/opt/local/bin:/sbin:/usr/sbin:/usr/bin:/opt/SUNWspro/bin:/opt/local/bin
SUBDIRS= bash bzip2 coreutils curl dialog g11n gnupg gtar gzip less libexpat \
libidn libm libxml libz ncurses node.js nss-nspr ntp openldap openssl \
pbzip2 perl rsync rsyslog screen socat tun uuid vim wget
@@ -54,10 +54,10 @@ all: $(SUBDIRS)
# environment variable nulls out the search path. Other vars just control what
# gets appended.
#
-$(DESTDIR)/usr/sfw/bin/gcc: FRC
+$(DESTDIR)/usr/bin/gcc: FRC
cd gcc4; PKG_CONFIG_LIBDIR="" $(MAKE) PARALLEL=$(PARALLEL) DESTDIR=$(DESTDIR) install
-$(SUBDIRS): $(DESTDIR)/usr/sfw/bin/gcc
+$(SUBDIRS): $(DESTDIR)/usr/bin/gcc
cd $@; PKG_CONFIG_LIBDIR="" $(MAKE) PARALLEL=$(PARALLEL) DESTDIR=$(DESTDIR) install
install: $(SUBDIRS) gcc4
View
@@ -34,7 +34,7 @@ all: $(VER)/config.status
install: all
mkdir -p $(DESTDIR)
- ( cd $(VER); \
+ ( cd $(VER); env - PATH=$(PATH) \
gmake DESTDIR=$(DESTDIR) install)
clean:
View
@@ -29,7 +29,7 @@
# and 2 install scripts are used.
VER=bzip2-1.0.6
-GCC=$(DESTDIR)/usr/sfw/bin/gcc
+GCC=$(DESTDIR)/usr/bin/gcc
all: real-all
View
@@ -24,7 +24,7 @@
VER=coreutils-8.13
BASE=$(PWD)
DESTDIR=$(BASE)/../proto
-CC=$(DESTDIR)/usr/sfw/bin/gcc
+CC=$(DESTDIR)/usr/bin/gcc
GTAR=/usr/bin/gtar
all: $(VER)/config.status
View
@@ -25,7 +25,7 @@
VER=curl-7.21.2
BASE=$(PWD)
DESTDIR=$(BASE)/../proto
-GCC=$(DESTDIR)/usr/sfw/bin/gcc
+GCC=$(DESTDIR)/usr/bin/gcc
-include ../Makefile.inc
View
@@ -29,8 +29,8 @@ VER=dialog-1.1-20111020
BASE=$(PWD)
DESTDIR=$(BASE)/../proto
-GCC=$(DESTDIR)/usr/sfw/bin/gcc
-GXX=$(DESTDIR)/usr/sfw/bin/g++
+GCC=$(DESTDIR)/usr/bin/gcc
+GXX=$(DESTDIR)/usr/bin/g++
all: $(VER)/src/auto/config.status
(cd $(VER); env \
View
@@ -67,11 +67,6 @@ ONBLD_TOOLS= $(BUILD_TOOLS)/onbld
JAVA_ROOT= /usr/java
-SFW_ROOT= /usr/sfw
-SFWINCDIR= $(SFW_ROOT)/include
-SFWLIBDIR= $(SFW_ROOT)/lib
-SFWLIBDIR64= $(SFW_ROOT)/lib/$(MACH64)
-
RPCGEN= /usr/bin/rpcgen
STABS= $(ONBLD_TOOLS)/bin/$(MACH)/stabs
ECHO= echo
View
@@ -30,7 +30,7 @@
VER=gcc-4.4.4
-SFW_PATH="/usr/ccs/bin:/opt/local/bin:/usr/sfw/bin:/usr/bin:/opt/local/bin"
+SFW_PATH="/opt/local/bin:/usr/bin"
BASE=$(PWD)
DESTDIR=$(BASE)/../proto
@@ -69,11 +69,11 @@ $(VER)-i386-build/config.status: $(VER)-i386-build $(VER)/configure
PATH=$(SFW_PATH) \
MAKE=gmake \
../$(VER)/configure \
- --prefix=/usr/sfw \
- --with-ld=/usr/ccs/bin/ld \
+ --prefix=/usr \
+ --with-ld=/usr/bin/ld \
--without-gnu-ld \
--with-gnu-as \
- --with-as=/usr/gnu/bin/as \
+ --with-as=/usr/bin/gas \
--enable-languages="c,c++" \
--enable-shared \
--with-gmp=/opt/local \
View
@@ -25,7 +25,7 @@
VER=gnupg-1.4.11
BASE=$(PWD)
DESTDIR=$(BASE)/../proto
-GCC=$(DESTDIR)/usr/sfw/bin/gcc
+GCC=$(DESTDIR)/usr/bin/gcc
all: $(VER)/config.status
( cd $(VER); \
View
@@ -24,7 +24,7 @@
VER=tar-1.23
BASE=$(PWD)
DESTDIR=$(BASE)/../proto
-CC=$(DESTDIR)/usr/sfw/bin/gcc
+CC=$(DESTDIR)/usr/bin/gcc
SH=ksh93
LD_OPTIONS="-M $(BASE)/mapfile_noexstk"
View
@@ -26,7 +26,7 @@ BASE=$(PWD)
DESTDIR=$(BASE)/../proto
BINDIR=$(DESTDIR)/usr/bin
MANDIR=$(DESTDIR)/usr/share/man/man1
-GCC=$(DESTDIR)/usr/sfw/bin/gcc
+GCC=$(DESTDIR)/usr/bin/gcc
all: $(VER)/config.status
( cd $(VER); env - PATH=$(PATH) \
View
@@ -25,7 +25,7 @@
VER=less-436
BASE=$(PWD)
DESTDIR=$(BASE)/../proto
-GCC=$(DESTDIR)/usr/sfw/bin/gcc
+GCC=$(DESTDIR)/usr/bin/gcc
all: $(VER)/config.status
( cd $(VER); \
View
@@ -26,8 +26,8 @@ VER64=$(VER)-64
LARGEFILES= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
BASE=$(PWD)
DESTDIR=$(BASE)/../proto
-CC=$(DESTDIR)/usr/sfw/bin/gcc
-CCC=$(DESTDIR)/usr/sfw/bin/g++
+CC=$(DESTDIR)/usr/bin/gcc
+CCC=$(DESTDIR)/usr/bin/g++
CC64=$(CC)
CCC64=$(CCC)
CCFLAGS="-fPIC"
View
@@ -26,8 +26,8 @@ LARGEFILES= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
BASE=$(PWD)
DESTDIR=$(BASE)/../proto
MAKE=gmake
-CC=$(DESTDIR)/usr/sfw/bin/gcc
-CCC=$(DESTDIR)/usr/sfw/bin/g++
+CC=$(DESTDIR)/usr/bin/gcc
+CCC=$(DESTDIR)/usr/bin/g++
all: $(VER)/config.status
(cd $(VER); env \
View
@@ -39,7 +39,7 @@ LARGEFILES= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
BASE=$(PWD)
DESTDIR=$(BASE)/../proto
-GCC=$(DESTDIR)/usr/sfw/bin/gcc
+GCC=$(DESTDIR)/usr/bin/gcc
-include ../Makefile.inc
@@ -86,7 +86,7 @@ $(VER)/config.status: $(VER)/configure
(cd $(VER); \
env - "CC=$(GCC)" "CFLAGS=$(LARGEFILES)" \
"LDFLAGS=$(LDFLAGS)" \
- "PATH=$(DESTDIR)/usr/sfw/bin/:/usr/gnu/bin:$(PATH)" \
+ "PATH=$(DESTDIR)/usr/bin/:$(PATH)" \
./configure --prefix=/usr --with-threads \
--without-python)
cp mapfile $(VER)/libxml2.syms
@@ -96,7 +96,7 @@ $(VER64)/config.status: $(VER64)/configure
(cd $(VER64); \
env - "CC=$(GCC)" "CFLAGS=-m64 $(LARGEFILES)" \
"LDFLAGS=$(LDFLAGS)" \
- "PATH=$(DESTDIR)/usr/sfw/bin/:/usr/gnu/bin:$(PATH)" \
+ "PATH=$(DESTDIR)/usr/bin/:$(PATH)" \
./configure --prefix=/usr --with-threads \
--without-python)
cp mapfile $(VER64)/libxml2.syms
View
@@ -35,15 +35,15 @@ VER64=$(VER)-64
BASE=$(PWD)
DESTDIR=$(BASE)/../proto
-GCC=$(DESTDIR)/usr/sfw/bin/gcc
+GCC=$(DESTDIR)/usr/bin/gcc
all: real-all
all32: $(VER)/zconf.h
(cd $(VER); env "CC=$(GCC) -fPIC" \
"LDFLAGS= -lc -lz" \
"LDSHARED=$(GCC) -fno-builtin -nodefaultlibs -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) \
+ PATH=$(DESTDIR)/usr/bin/:$(PATH) \
make -e $(PARALLEL))
# must override LDSHARED here, or the makefile uses the wrong
@@ -54,7 +54,7 @@ all64: $(VER64)/zconf.h
(cd $(VER64); env "CC=$(GCC) -m64 -fPIC" \
"LDFLAGS=-nodefaultlibs -lc -lz" \
"LDSHARED=$(GCC) -m64 -fno-builtin -nodefaultlibs -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) \
+ PATH=$(DESTDIR)/usr/bin/:$(PATH) \
make -e $(PARALLEL))
install: all
@@ -65,7 +65,7 @@ real-all: all32 all64
$(VER)/zconf.h: $(VER)/configure
(cd $(VER); env \
- PATH=$(DESTDIR)/usr/sfw/bin/:$(PATH) \
+ PATH=$(DESTDIR)/usr/bin/:$(PATH) \
./configure --shared \
--prefix=/usr)
@@ -76,7 +76,7 @@ $(VER)/zconf.h: $(VER)/configure
$(VER64)/zconf.h: $(VER64)/configure
(cd $(VER64); env \
- PATH=$(DESTDIR)/usr/sfw/bin/:$(PATH) CC=$(GCC)\
+ PATH=$(DESTDIR)/usr/bin/:$(PATH) CC=$(GCC)\
./configure --shared \
--prefix=/usr)
Oops, something went wrong.

0 comments on commit 9186f51

Please sign in to comment.