Changeset 37606

Timestamp:

2023-04-05T13:51:58+12:00 (13 months ago)

Author:

anupama

Message:

1. Fixed my bug in merged compile.xml for rk3, where the Mojave suffix was necessary to grab the correctly named gnome-lib-minimal also used up to (at least) Mac Monterey. 2. The -Wno-error=implicit-function-declaration can be commented out in compile.xml as it's been added to GS3's gs3-devel.sh and works fine there.

File:

• main/trunk/release-kits/kits/rk3/ant-scripts/compile.xml (modified) (2 diffs)

main/trunk/release-kits/kits/rk3/ant-scripts/compile.xml

@@ -67 +67 @@
             <!-- For Lions, need a specific gnome-lib-minimal tar file. The file name contains darwin12 for Lion, it contains the os.shell name (darwin/linux) for other cases.
             Mac OS X v10.7.4 onwards is Lion/Mountain Lion, different from Leopard/Snow Leopard. See http://en.wikipedia.org/wiki/Darwin_(operating_system) -->
-            <condition property="specific.os.type" value="${os.shell}-Lion" else="${os.shell}">
+            <condition property="specific.os.type" value="${os.shell}-Lion" else="${os.shell}-Mojave">
                 <and>
                     <contains string="${os.shell}" substring="darwin" casesensitive="false"/>
@@ -100 +100 @@
         <!-- <rsr file="${basedir}/compiled/build.xml" pattern="CFLAGS=&amp;quot;" replacement="CFLAGS=&amp;quot;-fPIC "/> -->
         <!-- mac only: make errors about missing extern declarations back into warnings as in old (Mojave and before) macs -->
+        <!--
         <if>
           <bool><equals arg1="${rk.os}" arg2="mac"/></bool>
           <rsr file="${basedir}/compiled/build.xml" pattern="CFLAGS=&amp;quot;" replacement="CFLAGS=&amp;quot;-Wno-error=implicit-function-declaration "/>
         </if>
+        -->
         
         <!-- run greenstone3's ant install and ant dist-tidy -->