[gentoo-commits] proj/releng:master commit in: tools-uclibc/desktop/portage/env/, tools-uclibc/desktop/, ...

[Anthony G. Basile]

commit:     3d4d415a27d8d11de167f48ad675b6d843d7d023
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 24 18:08:07 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Jan 24 18:09:11 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=3d4d415a

tools-uclibc/desktop: update build for uclibc desktop (lilblue)

---
 tools-uclibc/desktop/portage/env/cmake.conf         |  2 ++
 tools-uclibc/desktop/portage/env/mplayer2.conf      |  1 +
 tools-uclibc/desktop/portage/env/pinentry.conf      |  3 ++-
 tools-uclibc/desktop/portage/env/slim.conf          |  2 ++
 tools-uclibc/desktop/portage/env/xanim.conf         |  2 ++
 tools-uclibc/desktop/portage/env/xdg-user-dirs.conf |  1 +
 tools-uclibc/desktop/portage/package.env            |  5 +++++
 tools-uclibc/desktop/rebuild.sh                     |  2 +-
 tools-uclibc/desktop/run.sh                         |  2 ++
 tools-uclibc/desktop/toolchain.sh                   |  6 +++++-
 tools-uclibc/desktop/update.sh                      | 11 ++++++++---
 11 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/tools-uclibc/desktop/portage/env/cmake.conf b/tools-uclibc/desktop/portage/env/cmake.conf
new file mode 100644
index 0000000..08f1d68
--- /dev/null
+++ b/tools-uclibc/desktop/portage/env/cmake.conf
@@ -0,0 +1,2 @@
+#this should go upstream
+LDFLAGS="-lpthread"

diff --git a/tools-uclibc/desktop/portage/env/mplayer2.conf b/tools-uclibc/desktop/portage/env/mplayer2.conf
new file mode 100644
index 0000000..51d9d82
--- /dev/null
+++ b/tools-uclibc/desktop/portage/env/mplayer2.conf
@@ -0,0 +1 @@
+LDFLAGS="-lintl"

diff --git a/tools-uclibc/desktop/portage/env/pinentry.conf b/tools-uclibc/desktop/portage/env/pinentry.conf
index 518a258..a97e239 100644
--- a/tools-uclibc/desktop/portage/env/pinentry.conf
+++ b/tools-uclibc/desktop/portage/env/pinentry.conf
@@ -1 +1,2 @@
-CFLAGS="-liconv"
+#this should go upstream
+LDFLAGS="-liconv -lpthread"

diff --git a/tools-uclibc/desktop/portage/env/slim.conf b/tools-uclibc/desktop/portage/env/slim.conf
new file mode 100644
index 0000000..08f1d68
--- /dev/null
+++ b/tools-uclibc/desktop/portage/env/slim.conf
@@ -0,0 +1,2 @@
+#this should go upstream
+LDFLAGS="-lpthread"

diff --git a/tools-uclibc/desktop/portage/env/xanim.conf b/tools-uclibc/desktop/portage/env/xanim.conf
new file mode 100644
index 0000000..68f559e
--- /dev/null
+++ b/tools-uclibc/desktop/portage/env/xanim.conf
@@ -0,0 +1,2 @@
+#This needs to be fixed in the tree
+LDFLAGS="-ldl"

diff --git a/tools-uclibc/desktop/portage/env/xdg-user-dirs.conf b/tools-uclibc/desktop/portage/env/xdg-user-dirs.conf
new file mode 100644
index 0000000..247baf2
--- /dev/null
+++ b/tools-uclibc/desktop/portage/env/xdg-user-dirs.conf
@@ -0,0 +1 @@
+LDFLAGS="-liconv -lpthread"

diff --git a/tools-uclibc/desktop/portage/package.env b/tools-uclibc/desktop/portage/package.env
index fa23f55..f5d3142 100644
--- a/tools-uclibc/desktop/portage/package.env
+++ b/tools-uclibc/desktop/portage/package.env
@@ -1,10 +1,15 @@
 app-crypt/pinentry pinentry.conf
 dev-libs/pakchois pakchois.conf
 dev-python/pygobject pygobject.conf
+dev-util/cmake cmake.conf
 dev-vcs/git git.conf
 media-gfx/fontforge fontforge.conf
 media-libs/libquicktime libquicktime.conf
 media-video/ffmpeg ffmpeg.conf
+media-video/mplayer2 mplayer2.conf
+media-video/xanim xanim.conf
 net-print/cups-filters cups-filters.conf
 sys-apps/coreutils coreutils.conf
 x11-libs/gdk-pixbuf gdk-pixbuf.conf
+x11-misc/slim slim.conf
+x11-misc/xdg-user-dirs xdg-user-dirs.conf

diff --git a/tools-uclibc/desktop/rebuild.sh b/tools-uclibc/desktop/rebuild.sh
index c22e006..20d52bd 100755
--- a/tools-uclibc/desktop/rebuild.sh
+++ b/tools-uclibc/desktop/rebuild.sh
@@ -2,4 +2,4 @@
 
 source /etc/profile
 env-update
-emerge --keep-going -evq world
+emerge -evq --keep-going --with-bdeps=y world

diff --git a/tools-uclibc/desktop/run.sh b/tools-uclibc/desktop/run.sh
index 6cc99fa..7fd2b4b 100755
--- a/tools-uclibc/desktop/run.sh
+++ b/tools-uclibc/desktop/run.sh
@@ -19,6 +19,7 @@ mount_dirs() {
 	mount --bind /proc/ "${ROOTFS}"/proc/
 	mount --bind /dev/ "${ROOTFS}"/dev/
 	mount --bind /dev/pts "${ROOTFS}"/dev/pts/
+	mount -t tmpfs shm "${ROOTFS}"/dev/shm
 	mount --bind /sys/ "${ROOTFS}"/sys/
 }
 
@@ -156,6 +157,7 @@ cleanup_dirs() {
 
 unmount_dirs() {
 	umount "${ROOTFS}"/sys/
+	umount "${ROOTFS}"/dev/shm
 	umount "${ROOTFS}"/dev/pts/
 	umount "${ROOTFS}"/dev/
 	umount "${ROOTFS}"/proc/

diff --git a/tools-uclibc/desktop/toolchain.sh b/tools-uclibc/desktop/toolchain.sh
index 0458679..01e406e 100755
--- a/tools-uclibc/desktop/toolchain.sh
+++ b/tools-uclibc/desktop/toolchain.sh
@@ -2,6 +2,10 @@
 
 source /etc/profile
 env-update
+emerge -1q binutils
+source /etc/profile
+env-update
 emerge -1q gcc
+source /etc/profile
+env-update
 emerge -1q uclibc
-emerge -1q binutils

diff --git a/tools-uclibc/desktop/update.sh b/tools-uclibc/desktop/update.sh
index 434d47f..56f2e50 100755
--- a/tools-uclibc/desktop/update.sh
+++ b/tools-uclibc/desktop/update.sh
@@ -1,8 +1,13 @@
 #!/bin/bash -l
 
+#hacky - for some reason cairo fails to rebuild
+#unless binutils is rebuilt first.  It fails to
+#find libibirty.
 source /etc/profile
 env-update
-#hacky - for some reason cairo fails to rebuild
-#unless binutils is rebuilt first.
 emerge -q binutils
-emerge -uvNDq world
+source /etc/profile
+env-update
+emerge -1q x11-libs/cairo
+
+emerge -uvNDq --keep-going --with-bdeps=y world