[SM-Commit] PERFORCE change 76803 by David Michael Leo Brown Jr. for review

Perforce Review Daemon p4review at smee.org
Sun Mar 26 00:20:01 EST 2006


Change 76803 by david_brown at dmlb2000-dmlb2004 on 2006/03/26 06:15:53

	integrated from devel

Affected files ...

... //sgl/grimoires/test/science/boinc/BUILD#3 integrate
... //sgl/grimoires/test/science/boinc/DEPENDS#4 integrate
... //sgl/grimoires/test/science/boinc/DETAILS#2 integrate
... //sgl/grimoires/test/science/boinc/HISTORY#5 integrate
... //sgl/grimoires/test/science/boinc/PRE_BUILD#2 integrate
... //sgl/grimoires/test/science/boinc/configure-ac-wx-config-args.patch#2 delete

Differences ...

==== //sgl/grimoires/test/science/boinc/BUILD#3 (xtext) ====

@@ -7,5 +7,13 @@
 then
   OPTS="$OPTS --enable-server"
 fi &&
+case "${SMGL_COMPAT_ARCH[0]}" in
+  64)
+    OPTS="$OPTS --enable-bitness=64"
+    ;;
+  32)
+    OPTS="$OPTS --enable-bitness=32"
+    ;;
+esac &&
 OPTS="$OPTS --with-gnu-ld"
 default_build

==== //sgl/grimoires/test/science/boinc/DEPENDS#4 (xtext) ====

@@ -1,8 +1,11 @@
 depends  autoconf  &&
 depends  automake  &&
+depends  g++       &&
 depends  curl      &&
-
-optional_depends  wxgtk-no-unicode         \
-                  ''                       \
-                  ''                       \
-                  'for a wxGTK-based GUI'
+if [[ $BOINC_PARTS == both || $BOINC_PARTS == client ]]
+then
+  depends  wxgtk-no-unicode '--with-wx-config=wx-config' 
+elif [[ $BOINC_PARTS == both || $BOINC_PARTS == server ]]
+then
+  depends  mysql 'MYSQL_CONFIG=mysql_config'
+fi

==== //sgl/grimoires/test/science/boinc/DETAILS#2 (xtext) ====

@@ -12,6 +12,7 @@
    SOURCE_IGNORE=volatile
       LICENSE[0]=GPL
       PATCHLEVEL=1
+       BUILD_API=2
         WEB_SITE=http://boinc.berkeley.edu/
          ENTERED=20010922
          UPDATED=20040517

==== //sgl/grimoires/test/science/boinc/HISTORY#5 (text) ====

@@ -1,3 +1,10 @@
+2006-03-25 David Brown <dmlb2000 at gmail.com>
+	* DETAILS: changed to build api 2
+	* DEPENDS: g++ mysql and made switch on BOINC_PARTS
+	* BUILD: added bitness flags 32 vs. 64
+	* PRE_BUILD: removed comment for patch
+	* configure-ac-wx-config-args.patch: removed not needed
+
 2006-03-25 Robin Cook <rcook at wyrms.net>
         * BUILD: added create_account
         * init.d: added to start on boot up

==== //sgl/grimoires/test/science/boinc/PRE_BUILD#2 (xtext) ====

@@ -1,4 +1,3 @@
 default_pre_build &&
 cd $SOURCE_DIRECTORY &&
-#patch -p1 < $SCRIPT_DIRECTORY/configure-ac-wx-config-args.patch &&
 ./_autosetup



More information about the SM-Commit mailing list