[Lunar-commits] <moonbase> xfce4: stop building unused static libs

[Paul Bredbury]

commit eaaf117981679bd01e4840b6b327a75dc31d773f
Author: Paul Bredbury <brebs at lunar-linux.org>
Date:   Tue Jan 25 10:50:19 2011 +0700

    xfce4: stop building unused static libs
---
 xfce4/core/garcon/BUILD        |    3 +++
 xfce4/core/libxfce4util/BUILD  |   12 +++++++-----
 xfce4/core/libxfcegui4/BUILD   |   14 ++++++++++----
 xfce4/core/xfce4-panel/BUILD   |    3 +++
 xfce4/core/xfce4-session/BUILD |   16 +++++++++++-----
 xfce4/core/xfconf/BUILD        |    8 ++++++++
 6 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/xfce4/core/garcon/BUILD b/xfce4/core/garcon/BUILD
index f40c967..be192e9 100644
--- a/xfce4/core/garcon/BUILD
+++ b/xfce4/core/garcon/BUILD
@@ -3,6 +3,9 @@
   # Substitute missing icon
   sedit "s:Icon=applications-education:Icon=applications-science:1" data/xfce/xfce-education.directory.in  &&
 
+  # http://bugzilla.xfce.org/show_bug.cgi?id=6920
+  OPTS+=" --disable-static" &&
+
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/xfce4/core/libxfce4util/BUILD b/xfce4/core/libxfce4util/BUILD
index dedae22..6cf1b57 100644
--- a/xfce4/core/libxfce4util/BUILD
+++ b/xfce4/core/libxfce4util/BUILD
@@ -1,10 +1,12 @@
 (
-   [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
 
-   ./configure  --build=$BUILD             \
-                --prefix=${MODULE_PREFIX}  \
-                $OPTS                     &&
+  if [ -f /etc/profile.d/xfce4.rc ] ; then
+    . /etc/profile.d/xfce4.rc
+  fi &&
 
-   default_make
+  # http://bugzilla.xfce.org/show_bug.cgi?id=6920
+  OPTS+=" --disable-static" &&
+
+  default_build
 
 ) > $C_FIFO 2>&1
diff --git a/xfce4/core/libxfcegui4/BUILD b/xfce4/core/libxfcegui4/BUILD
index 1776fd6..4e62e48 100644
--- a/xfce4/core/libxfcegui4/BUILD
+++ b/xfce4/core/libxfcegui4/BUILD
@@ -1,9 +1,15 @@
 (
-   [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
 
-   # make sure proper PKG_CONFIG_PATH is set
-   export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+  if [ -f /etc/profile.d/xfce4.rc ] ; then
+    . /etc/profile.d/xfce4.rc
+  fi &&
 
-   default_build
+  # Make sure proper PKG_CONFIG_PATH is set
+  export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+
+  # http://bugzilla.xfce.org/show_bug.cgi?id=6920
+  OPTS+=" --disable-static" &&
+
+  default_build
 
 ) > $C_FIFO 2>&1
diff --git a/xfce4/core/xfce4-panel/BUILD b/xfce4/core/xfce4-panel/BUILD
index ba09587..5aaffc3 100644
--- a/xfce4/core/xfce4-panel/BUILD
+++ b/xfce4/core/xfce4-panel/BUILD
@@ -10,6 +10,9 @@
   # Make sure proper PKG_CONFIG_PATH is set
   export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
 
+  # http://bugzilla.xfce.org/show_bug.cgi?id=6920
+  OPTS+=" --disable-static" &&
+
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/xfce4/core/xfce4-session/BUILD b/xfce4/core/xfce4-session/BUILD
index 2d64947..7b978f1 100644
--- a/xfce4/core/xfce4-session/BUILD
+++ b/xfce4/core/xfce4-session/BUILD
@@ -1,11 +1,17 @@
 (
-   [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
 
-   # make sure proper PKG_CONFIG_PATH is set
-   export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}"  &&
+  if [ -f /etc/profile.d/xfce4.rc ] ; then
+    . /etc/profile.d/xfce4.rc
+  fi &&
 
-   PATH="$PATH:/usr/X11/bin"  &&
+  # Make sure proper PKG_CONFIG_PATH is set
+  export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
 
-   default_build
+  PATH="$PATH:/usr/X11/bin" &&
+
+  # http://bugzilla.xfce.org/show_bug.cgi?id=6920
+  OPTS+=" --disable-static" &&
+
+  default_build
 
 ) > $C_FIFO 2>&1
diff --git a/xfce4/core/xfconf/BUILD b/xfce4/core/xfconf/BUILD
new file mode 100644
index 0000000..689034e
--- /dev/null
+++ b/xfce4/core/xfconf/BUILD
@@ -0,0 +1,8 @@
+(
+
+  # http://bugzilla.xfce.org/show_bug.cgi?id=6920
+  OPTS+=" --disable-static" &&
+
+  default_build
+
+) > $C_FIFO 2>&1