[SM-Commit] PERFORCE change 76711 by Mathieu Lonjaret for review
Mathieu L.
lejatorn at smgl.homelinux.net
Sat Mar 25 06:36:27 EST 2006
ok, I've been told it's working fine so pulling it into test.
Can it be pulled to stable too if nobody complains please?
Cheers,
Mathieu.
On Fri, Mar 24, 2006 at 04:15:00PM +0000, Perforce Review Daemon wrote:
> Change 76711 by mathieu_lonjaret at lejatorn-gluon on 2006/03/24 16:12:05
>
> reworked query
>
> Affected files ...
>
> ... //sgl/grimoires/devel/ftp/proftpd/BUILD#3 edit
> ... //sgl/grimoires/devel/ftp/proftpd/CONFIGURE#3 edit
> ... //sgl/grimoires/devel/ftp/proftpd/HISTORY#10 edit
>
> Differences ...
>
> ==== //sgl/grimoires/devel/ftp/proftpd/BUILD#3 (xtext) ====
>
> @@ -1,11 +1,9 @@
> if [[ $PROFTPD_DEVEL == "n" ]]; then
> if [[ -z $PROFTPD_CAPS ]]; then
> - if [[ $PROFTPD_NOPRELINK == "y" ]]; then
> CFLAGS=${CFLAGS/-fPIC} &&
> CFLAGS=${CFLAGS/-DPIC} &&
> CXXFLAGS=${CXXFLAGS/-fPIC} &&
> CXXFLAGS=${CXXFLAGS/-DPIC}
> - fi
> fi
> fi &&
>
>
> ==== //sgl/grimoires/devel/ftp/proftpd/CONFIGURE#3 (xtext) ====
>
> @@ -1,11 +1,11 @@
> +. $GRIMOIRE/FUNCTIONS &&
> if [[ $PROFTPD_DEVEL == "n" ]]; then
> - config_query_option PROFTPD_CAPS "Disable capabilities?" n \
> - "--disable-cap" "" &&
> - if [[ -z $PROFTPD_CAPS ]]; then
> - config_query PROFTPD_NOPRELINK "Disable prelink? (do that if it fails with \
> -an asm error)" n
> + if [[ $(get_sorcery_kernel_config CONFIG_SECURITY) != y ]]; then
> + config_query_option PROFTPD_CAPS \
> + "You don't have capabilities enabled in your kernel, do you still \
> + want to build them?" n "" "--disable-cap"
> fi
> -fi &&
> +fi &&
>
> #rest of the file still needs to be rewritten properly
> if ! grep -q 'CONFIGURED=\"y\"' ${DEPENDS_CONFIG}/proftpd; then
>
> ==== //sgl/grimoires/devel/ftp/proftpd/HISTORY#10 (text) ====
>
> @@ -1,3 +1,6 @@
> +2006-03-24 Mathieu Lonjaret <lejatorn at sourcemage.org>
> + *BUILD, CONFIGURE: reworked query
> +
> 2006-03-20 Mathieu Lonjaret <lejatorn at sourcemage.org>
> *BUILD, CONFIGURE, DETAILS, PREPARE: added queries to build even
> when capabilities are not kernel enabled.
More information about the SM-Commit
mailing list