sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] PERFORCE change 76711 by Mathieu Lonjaret for review

From: Perforce Review Daemon <p4review AT smee.org>
To: "Andraž " ruskie " Levstik" <ruskie AT mages.ath.cx>, "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT gmail.com>, "Arwed von Merkatz" <v.merkatz AT gmx.net>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "David Kowis" <dkowis+smgl-p4 AT shlrm.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Eric Sandall" <eric AT sandall.us>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "George J. Sherwood" <george AT beernabeer.com>, "Jason Flatt" <jflatt AT sourcemage.org>, "Jeremy Blosser" <jblosser AT sourcemage.org>, "Juuso Alasuutari" <iuso AT sourcemage.org>, "Ladislav Hagara" <ladislav.hagara AT unob.cz>, "Mathieu Lonjaret" <lejatorn AT sourcemage.org>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Pol Vinogradov" <vin.public AT gmail.com>, "Robin Cook" <rcook AT wyrms.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
Subject: [SM-Commit] PERFORCE change 76711 by Mathieu Lonjaret for review
Date: Fri, 24 Mar 2006 16:15:00 +0000 (GMT)

Change 76711 by mathieu_lonjaret@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.

[SM-Commit] PERFORCE change 76711 by Mathieu Lonjaret for review, Perforce Review Daemon, 03/24/2006
- Re: [SM-Commit] PERFORCE change 76711 by Mathieu Lonjaret for review, Mathieu L., 03/25/2006
  - Re: [SM-Commit] PERFORCE change 76711 by Mathieu Lonjaret for review, Arwed von Merkatz, 03/26/2006