diff options
Diffstat (limited to 'package/pkgmaker')
| -rw-r--r-- | package/pkgmaker | 48 |
1 files changed, 43 insertions, 5 deletions
diff --git a/package/pkgmaker b/package/pkgmaker index 5a4707937..169b05643 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -11,6 +11,9 @@ GMAKE="$GMAKE --no-print-directory" (( x_cols = (COLUMNS > 10) ? COLUMNS - 2 : 80 )) typeset -L$x_cols pbar +# check for trailing whitespace +#grep -H '[[:space:]]$' */Makefile && print "Found trailing whitespace, please fix" + # build a cache of “ipkg package name” → “package conf option” for # use with dependency resolution rm -rf pkglist.d @@ -52,6 +55,7 @@ for dn in */Makefile; do # PKG_NAME: package name (directory, free-format) # PKG_FLAVOURS: all package flavours (boolean options), uppercase + # PKG_CHOICES: all package choices (boolean options), uppercase # PKG_DESCR: package description (directory) # PKG_URL: package homepage # PKG_CXX: uppercase varname part to use for CFrustFrust checks @@ -63,10 +67,13 @@ for dn in */Makefile; do # CFLINE_*: one free-format Config.in line per subpackage option # PKGFD_*: flavour description, per package flavour option # PKG_{HOST,TARGET}_DEPENDS: add host or target dependencies - eval $($GMAKE dump="PKG_NAME PKG_FLAVOURS PKG_DESCR PKG_SECTION PKG_URL PKG_MULTI PKG_CXX \ + eval $($GMAKE dump="PKG_NAME PKG_FLAVOURS PKG_CHOICES PKG_DESCR PKG_SECTION PKG_URL PKG_MULTI PKG_CXX \ ALL_PKGOPTS \$(foreach x,\${ALL_PKGOPTS},PKGNAME_\${x} \ PKGDESC_\${x} PKGDEPS_\${x} PKGDFLT_\${x} PKGSECT_\${x} CFLINE_\${x}) \ \$(foreach x,\${PKG_FLAVOURS},PKGFD_\${x}) \ + \$(foreach x,\${PKG_FLAVOURS},PKGFS_\${x}) \ + \$(foreach x,\${PKG_CHOICES},PKGCD_\${x}) \ + \$(foreach x,\${PKG_CHOICES},PKGCS_\${x}) \ PKG_HOST_DEPENDS PKG_TARGET_DEPENDS") # dnu: directory name, uppercase, y/-+/_X/ @@ -215,6 +222,10 @@ for dn in */Makefile; do (*) # produce dependency on regular package # where the symbol is cached (see above) + if [[ ! -f ../pkglist.d/"$dep" ]]; then + print -u2 "Warning: $PKG_NAME: unreachable dependency '$dep'" + continue + fi print -u$h '\tselect' \ ADK_PACKAGE_$(<../pkglist.d/"$dep") ;; @@ -251,18 +262,43 @@ config ADK_COMPILE_${PKG_CXX}_WITH_UCLIBCXX endchoice EOF + [[ -n $PKG_CHOICES ]] && cat >&4 <<EOF + +choice +prompt "Package flavour choice" +depends on ADK_COMPILE_$dnu +EOF + # Handle choices + for pfco in $PKG_CHOICES; do + eval pfcd=\$PKGCD_$pfco + eval pfcs=\$PKGCS_$pfco + typeset -u pfcs=${pfcs#!} + print + print config ADK_PACKAGE_${dnu}_$pfco + print "\tbool \"$pfcd\"" + print "\\tselect ADK_PACKAGE_${pfcs}" + done >&4 + [[ -n $PKG_CHOICES ]] && cat >&4 <<EOF + +endchoice +EOF + # Handle flavours (per directory) for pfcu in $PKG_FLAVOURS; do # pfcu: pkg flavour conf opt. eval pfd=\$PKGFD_$pfcu # pfd: pkg flavour description + eval pfs=\$PKGFS_$pfcu # pfs: pkg flavour dependencies print print config ADK_PACKAGE_${dnu}_$pfcu print "\tbool \"${pfd:-$PKG_NAME -> flavour $pfcu}\"" print \\tdefault n print \\tdepends on ADK_COMPILE_$dnu + for pfso in $pfs; do + typeset -u pfso=${pfso#!} + print \\tselect ADK_PACKAGE_${pfso} + done print \\thelp print "\t flavour ADK_PACKAGE_${dnu}_$pfcu for $PKG_NAME" done >&4 - cd .. done @@ -275,7 +311,7 @@ function non_empty_file() { # print the verbose section name for a given section tag function lookup_section_string() { - str="$(grep ^$1\ SECTIONS.list | cut -d ' ' -f '2-')" + str="$(grep ^$1\ sections.lst | cut -d ' ' -f '2-')" [[ -n $str ]] && { echo $str; return; } echo $1 } @@ -310,6 +346,8 @@ sort -k 3 -k 1 -f package_section_list | while read name file section; do cursec="$section" fi print "source \"package/$file\"" -done >Config.in.auto + print -u3 "source \"package/${file%.*}\"" +done >Config.in.auto 3>Config.in.auto.pre print "endmenu\n" >>Config.in.auto -rm -f package_sections package_section_list +grep pkgconfigs.d Config.in.auto.pre | sort | uniq > Config.in.auto.global +rm -f package_sections package_section_list Config.in.auto.pre |