Solaris/buildpkg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

One more attempt at fixing the parse_def logic.

Browse Source 
New defaults needed by the enhanced strip function
This commit is contained in:
Tom G. Christensen 2004-05-26 15:37:05 +00:00
parent 3faeac8b79
commit de840b7038
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
buildpkg.packaging.solaris
View File

@ -10,6 +10,15 @@ PKGTRANS=/usr/bin/pkgtrans
# Override generic location # Override generic location
STRIP=/usr/ccs/bin/strip STRIP=/usr/ccs/bin/strip
# /usr/ccs/bin/strip destroys the symbol table in static archives
# So this is disabled by default
dostrip_static=0
# Setup default args for strip. They match SGU 4.0 from Solaris 8
# Change these if you're using strip from GNU Binutils (recommended)
strip_elf_args="" # GNU default is -g
strip_shared_args="" # GNU default is --strip-unneeded
strip_static_args="" # GNU default is -g
META_CLEAN="prototype prototype.in pkginfo files.tmp" META_CLEAN="prototype prototype.in pkginfo files.tmp"
@ -265,6 +274,7 @@ parse_def()
local foundfiles=0 local foundfiles=0
local secname="" local secname=""
local secpos=0 local secpos=0
local legalend=0
while read line while read line
do do
@ -276,6 +286,7 @@ parse_def()
else else
section=1 section=1
secname="${line:1:((${#line}-2))}" secname="${line:1:((${#line}-2))}"
legalend=0
fi fi
;; ;;
'') '')
@ -284,6 +295,7 @@ parse_def()
else else
section=0 # Finished this section section=0 # Finished this section
foundfiles=0 # foundfiles=0 #
legalend=1 # We encountered a syntacticly correct section end
# Add scripts if requested # Add scripts if requested
add_scripts $secname add_scripts $secname
fi fi
@ -336,13 +348,15 @@ parse_def()
done < $metadir/pkgdef done < $metadir/pkgdef
# If there is no blank line at the end of a pkgdef section (if there is only one section that is very # If there is no blank line at the end of a pkgdef section (if there is only one section that is very
# likely) then we end up here without having executed the 'section end' actions (case '' above) # likely) then we end up here without having executed the 'section end' actions (case '' above)
if [ $section -eq 0 ]; then if [ $legalend -eq 0 ]; then
error $E_BAD_SECTION_END parse_def if [ $section -eq 0 ]; then
else error $E_BAD_SECTION_END parse_def
section=0 # Finished this section else
foundfiles=0 # section=0 # Finished this section
# Add scripts if requested foundfiles=0 #
add_scripts $secname # Add scripts if requested
add_scripts $secname
fi
fi fi
} }