Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] PERFORCE change 80432 by Jason Flatt for review

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Perforce Review Daemon <p4review AT smee.org>
  • To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
  • Subject: [SM-Commit] PERFORCE change 80432 by Jason Flatt for review
  • Date: Fri, 9 Jun 2006 18:50:04 +0100 (BST)

Change 80432 by jason_flatt@jason-jason on 2006/06/09 18:46:57

It now compiles, installs and runs, but I think it can be done in a
better way. Maybe a re-run of aclocal, autoconf, etc., but I couldn't
get those to play nice.

Affected files ...

... //sgl/grimoires/devel/kde-apps/f4l/BUILD#2 edit
... //sgl/grimoires/devel/kde-apps/f4l/HISTORY#3 edit
... //sgl/grimoires/devel/kde-apps/f4l/Makefile-f4lm.patch#1 add
... //sgl/grimoires/devel/kde-apps/f4l/Makefile.patch#1 add
... //sgl/grimoires/devel/kde-apps/f4l/WIP#2 delete

Differences ...

==== //sgl/grimoires/devel/kde-apps/f4l/BUILD#2 (xtext) ====

@@ -1,1 +1,35 @@
-source $SECTION_DIRECTORY/KDE_BUILD
+OPTS="$KDE_DEBUG_OPTION \
+ $KDE_FINAL_OPTION \
+ $KDE_LDFLAGS \
+ --enable-dnotify \
+ --with-distribution \
+ --disable-dependency-tracking \
+ $OPTS" &&
+
+if [[ -f /etc/profile.d/qt.sh ]]; then
+ . /etc/profile.d/qt.sh
+fi &&
+
+#default_build
+
+# debug "build_api/api2" "real_default_build"
+
+ OPTS="$OPTS --build=${BUILD}"
+ #If these switches are used, they _may_ stop distcc and ccache from work$
+ # for some spells (bug 3798)
+ # We could write wrappers for all of the possible binaries
+ [[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=${HOST}"
+
+ ./configure --prefix=${INSTALL_ROOT}/usr \
+ --sysconfdir=${INSTALL_ROOT}/etc \
+ --localstatedir=${INSTALL_ROOT}/var \
+ --mandir=${INSTALL_ROOT}/usr/share/man \
+ --infodir=${INSTALL_ROOT}/usr/share/info \
+ $OPTS &&
+
+patch -p0 < $SCRIPT_DIRECTORY/Makefile.patch &&
+patch -p0 < $SCRIPT_DIRECTORY/Makefile-f4lm.patch &&
+
+ make
+
+#source $SECTION_DIRECTORY/KDE_BUILD

==== //sgl/grimoires/devel/kde-apps/f4l/HISTORY#3 (text) ====

@@ -1,5 +1,12 @@
+2006-06-09 Jason Flatt <jflatt AT sourcemage.org>
+ * BUILD: Copied in the default build scenario, so that the patches
+ could be applied between ./configure and make.
+ * Makefile-f4lm.patch, Makefile.patch: Patches for the Makefiles that
+ have hard coded paths and don't use the ./configure switches.
+
2005-11-29 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 -> SHA512

2005-06-04 Sergey Lipnevich <sergey AT sourcemage.org>
* ALL: spell created.
+



  • [SM-Commit] PERFORCE change 80432 by Jason Flatt for review, Perforce Review Daemon, 06/09/2006

Archive powered by MHonArc 2.6.24.

Top of Page