Skip to content

Commit

Permalink
OS-1588 library search path very broken in perl build
Browse files Browse the repository at this point in the history
  • Loading branch information
Keith M Wesolowski committed Jan 21, 2013
1 parent 6a988ef commit b9cadd2
Show file tree
Hide file tree
Showing 3 changed files with 103 additions and 9 deletions.
10 changes: 5 additions & 5 deletions perl/Config_heavy.pl
Expand Up @@ -169,7 +169,7 @@ sub myconfig {
castflags='0'
cat='cat'
cc='gcc'
cccdlflags='-KPIC'
cccdlflags='-fPIC'
ccdlflags=' '
ccflags='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DPERL_USE_SAFE_PUTENV'
ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
Expand Down Expand Up @@ -726,7 +726,7 @@ sub myconfig {
gidsign='1'
gidsize='4'
gidtype='gid_t'
glibpth='/usr/shlib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/local/lib'
glibpth='/usr/lib /lib'
gmake='gmake'
gmtime_r_proto='0'
gnulibc_version=''
Expand Down Expand Up @@ -892,7 +892,7 @@ sub myconfig {
libsdirs=' /usr/lib'
libsfiles=' libsocket.so libnsl.so libdl.so libm.so libc.so'
libsfound=' /usr/lib/libsocket.so /usr/lib/libnsl.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libc.so'
libspath=' /opt/local/lib /usr/gnu/lib /usr/lib /usr/ccs/lib'
libspath=' /usr/gnu/lib /usr/lib'
libswanted='sfio socket bind inet nsl nm ndbm gdbm dbm db dl dld sun m util c cposix posix bsd BSD '
libswanted_uselargefiles=''
line=''
Expand All @@ -901,8 +901,8 @@ sub myconfig {
ln='ln'
lns='/usr/bin/ln -s'
localtime_r_proto='0'
locincpth='/usr/local/include /opt/local/include /usr/gnu/include /opt/gnu/include /usr/GNU/include /opt/GNU/include'
loclibpth='/usr/local/lib /opt/local/lib /usr/gnu/lib /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib'
locincpth='/usr/gnu/include'
loclibpth='/usr/gnu/lib /opt/gnu/lib'
longdblsize='12'
longlongsize='8'
longsize='4'
Expand Down
35 changes: 33 additions & 2 deletions perl/Makefile
Expand Up @@ -27,6 +27,27 @@ include ../Makefile.defs

UNPACK_SENTINEL = Configure

LF_CPPFLAGS = \
-D_LARGEFILE_SOURCE \
-D_FILE_OFFSET_BITS=64

BASIC_CPPFLAGS = \
-fno-strict-aliasing \
-pipe \
-fstack-protector

CPPFLAGS += \
$(BASIC_CPPFLAGS) \
$(LF_CPPFLAGS) \
-DPERL_USE_SAFE_PUTENV

LDFLAGS += \
-fstack-protector

SHARED_LDFLAGS = \
-G \
$(LDFLAGS)

include ../Makefile.targ

all: $(VER.32)/perldtrace.h
Expand All @@ -43,9 +64,19 @@ install: all
rm -f $(DESTDIR)/usr/perl5/5.12/lib/i86pc-solaris-64int/Config_heavy.pl
cp Config_heavy.pl $(DESTDIR)/usr/perl5/5.12/lib/i86pc-solaris-64int/

$(VER.32)/cflags: config.over $(VER.32)/Configure
$(VER.32)/config.over: config.over.in $(VER.32)/$(UNPACK_SENTINEL)
sed -e 's#@@CC@@#$(GCC)#g' \
-e 's#@@CPPFLAGS@@#$(CPPFLAGS)#g' \
-e 's#@@CFLAGS@@#$(CFLAGS)#g' \
-e 's#@@BASIC_CPPFLAGS@@#$(BASIC_CPPFLAGS)#g' \
-e 's#@@LF_CPPFLAGS@@#$(LF_CPPFLAGS)#g' \
-e 's#@@LDFLAGS@@#$(LDFLAGS)#g' \
-e 's#@@LIBS@@#$(LIBS)#g' \
-e 's#@@GMAKE@@#$(MAKE)#g' \
-e 's#@@SHARED_LDFLAGS@@#$(SHARED_LDFLAGS)#g' < $< > $@

$(VER.32)/cflags: $(VER.32)/config.over $(VER.32)/Configure
(cd $(VER.32) && \
cp -f ../config.over ./config.over && \
./Configure -des -Dcc=$(GCC) )

$(VER.32)/perldtrace.h: $(VER.32)/cflags
Expand Down
67 changes: 65 additions & 2 deletions perl/config.over → perl/config.over.in
@@ -1,12 +1,40 @@
#!/bin/sh
aphostname='/usr/bin/hostname'
ar='/usr/bin/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'
awk='/usr/bin/nawk'
bin='/usr/perl5/5.12/bin'
binexp='/usr/perl5/5.12/bin'
bison='/opt/local/bin/bison'
cat='/usr/bin/cat'
cc='@@CC@@'
ccflags='@@CPPFLAGS@@ @@CFLAGS@@'
ccflags_uselargefiles='@@LF_CPPFLAGS@@'
cf_by='Joyent'
cf_email='bugs@illumos.org'
contains='/usr/bin/grep'
cp='/usr/bin/cp'
cpio=''
cpp='/opt/local/bin/cpp'
cppflags='@@BASIC_CPPFLAGS@@'
csh='/usr/bin/csh'
date='/usr/bin/date'
dtrace='/usr/sbin/dtrace'
echo='/usr/bin/echo'
egrep='/usr/bin/egrep'
expr='/usr/bin/expr'
full_ar='/usr/bin/ar'
full_csh='/usr/bin/csh'
full_sed='/usr/bin/sed'
glibpth='/usr/lib /lib'
gmake='@@GMAKE@@'
grep='/usr/bin/grep'
groupcat='/usr/bin/cat /etc/group'
gzip='/usr/bin/gzip'
hostcat='/usr/bin/cat /etc/hosts'
initialinstalllocation='/usr/perl5/5.12/bin'
installarchlib='/usr/perl5/5.12/lib/i86pc-solaris-64int'
installbin='/usr/perl5/5.12/bin'
Expand All @@ -28,26 +56,53 @@ installsiteman3dir='/usr/perl5/5.12/man/man3'
installsitescript='/usr/perl5/5.12/bin'
installstyle='lib'
installusrbinperl='undef'
issymlink='/usr/bin/test -h'
ld='@@CC@@'
lddlflags='@@SHARED_LDFLAGS@@'
ldflags='@@LDFLAGS@@ '
less='/usr/bin/less'
libpth='/usr/lib /lib'
libsdirs=' /usr/lib /lib'
libsfiles=' libsocket.so libnsl.so libdl.so libm.so libc.so'
libsfound=' /usr/lib/libsocket.so /usr/lib/libnsl.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libc.so'
libspath=' /usr/lib /lib /usr/gnu/lib'
ln='/usr/bin/ln'
lns='/usr/bin/ln -s'
locincpth='/usr/gnu/include'
loclibpth='/usr/gnu/lib'
make='/usr/ccs/bin/make'
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=''
mkdir='/usr/bin/mkdir'
more='/usr/bin/more'
myarchname='i86pc-solaris'
mydomain='.illumos.org'
myhostname='illumos'
nm='/usr/bin/nm'
nroff='/usr/bin/nroff'
package='perl5'
pager='/usr/bin/less -R'
passcat='/usr/bin/cat /etc/passwd'
perl5='/usr/bin/perl'
perladmin='bugs@illumos.org'
perlpath='/usr/perl5/5.12/bin/perl'
pg='/usr/bin/pg'
phostname='/usr/bin/hostname'
prefix='/usr/perl5/5.12'
prefixexp='/usr/perl5/5.12'
privlib='/usr/perl5/5.12/lib'
privlibexp='/usr/perl5/5.12/lib'
rm='/usr/bin/rm'
rm_try='/usr/bin/rm -f try try a.out .out try.[cho] try..o core core.try* try.core*'
scriptdir='/usr/perl5/5.12/bin'
scriptdirexp='/usr/perl5/5.12/bin'
sed='/usr/bin/sed'
sh='/bin/sh'
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'
Expand All @@ -67,6 +122,14 @@ siteprefix='/usr/perl5/5.12'
siteprefixexp='/usr/perl5/5.12'
sitescript='/usr/perl5/5.12/bin'
sitescriptexp='/usr/perl5/5.12/bin'
sort='/usr/bin/sort'
spitshell='/usr/bin/cat'
startperl='#!/usr/perl5/5.12/bin/perl'
dtrace='/usr/sbin/dtrace'
usedtrace='define'
test='/usr/bin/test'
touch='/usr/bin/touch'
tr='/usr/bin/tr'
uname='/usr/bin/uname'
uniq='/usr/bin/uniq'
xlibpth=''
yacc='/usr/bin/yacc'
zip=''

0 comments on commit b9cadd2

Please sign in to comment.