merge of 6ba3e310353ca1a6ea62e5f5f11c116d1a1fce6d

     and f8a273706c3fce0627a1d187a0aa71db62202670

5 files changed, 88 insertions, 2 deletions

diff --git a/packages/clearsilver/.mtn2git_empty b/packages/clearsilver/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/clearsilver/.mtn2git_empty
diff --git a/packages/clearsilver/clearsilver_0.10.3.bb b/packages/clearsilver/clearsilver_0.10.3.bb
new file mode 100644
index 0000000000..0e5a86ede2
--- /dev/null
+++ b/packages/clearsilver/clearsilver_0.10.3.bb
@@ -0,0 +1,27 @@
+# Clearsilver
+SECTION = "net"
+DESCRIPTION = "Clearsilver is a fast, powerful, and language-neutral HTML template system"
+LICENSE = "Neotonic ClearSilver License"
+DEPENDS = "python"
+MAINTAINER = "Cliff Brake <cliff.brake@gmail.com>"
+PR = "r0"
+
+SRC_URI = "http://www.clearsilver.net/downloads/${P}.tar.gz \
+           file://crosscompile.patch;patch=1"
+
+EXTRA_OECONF = "--disable-apache --disable-perl --disable-ruby --disable-java --disable-csharp --enable-gettext --with-python=${STAGING_BINDIR}/python"
+
+inherit autotools
+
+FILES_${PN} += "/usr/lib/python*"
+
+do_compile() {
+	BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} oe_runmake
+}
+
+do_configure() {
+	gnu-configize
+	oe_runconf
+}
+
+
diff --git a/packages/clearsilver/files/.mtn2git_empty b/packages/clearsilver/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/clearsilver/files/.mtn2git_empty
diff --git a/packages/clearsilver/files/crosscompile.patch b/packages/clearsilver/files/crosscompile.patch
new file mode 100644
index 0000000000..1b73bd5576
--- /dev/null
+++ b/packages/clearsilver/files/crosscompile.patch
@@ -0,0 +1,59 @@
+Index: clearsilver-0.10.3/cgi/Makefile
+===================================================================
+--- clearsilver-0.10.3.orig/cgi/Makefile
++++ clearsilver-0.10.3/cgi/Makefile
+@@ -30,13 +30,13 @@ $(CGI_LIB): $(CGI_OBJ)
+ 	$(RANLIB) $@
+ 
+ $(STATIC_EXE): $(STATIC_OBJ) $(DEP_LIBS)
+-	$(LD) $@ $(STATIC_OBJ) -L$(LIB_DIR) $(DLIBS) $(LIBS)
++	$(LD) $@ $(STATIC_OBJ) -L$(LIB_DIR) $(DLIBS) $(LIBS) $(LDFLAGS)
+ 
+ $(STATIC_CSO): $(STATIC_OBJ) $(DEP_LIBS)
+-	$(LDSHARED) -o $@ $(STATIC_OBJ) -L$(LIB_DIR) $(DLIBS) $(LIBS)
++	$(LDSHARED) -o $@ $(STATIC_OBJ) -L$(LIB_DIR) $(DLIBS) $(LIBS) $(LDFLAGS)
+ 
+ $(CGICSTEST_EXE): $(CGICSTEST_OBJ) $(DEP_LIBS)
+-	$(LD) $@ $(CGICSTEST_OBJ) -L$(LIB_DIR) $(DLIBS) $(LIBS)
++	$(LD) $@ $(CGICSTEST_OBJ) -L$(LIB_DIR) $(DLIBS) $(LIBS) $(LDFLAGS)
+ 
+ install: all
+ 	$(NEOTONIC_ROOT)/mkinstalldirs $(DESTDIR)$(cs_includedir)/cgi
+Index: clearsilver-0.10.3/cs/Makefile
+===================================================================
+--- clearsilver-0.10.3.orig/cs/Makefile
++++ clearsilver-0.10.3/cs/Makefile
+@@ -22,9 +22,9 @@ CSDUMP_EXE = csdump
+ CSDUMP_SRC = csdump.c
+ CSDUMP_OBJ = $(CSDUMP_SRC:%.c=%.o)
+ 
+-LIBS += -L$(LIB_DIR) -lneo_cs -lneo_utl #  -lefence
++LIBS += -L$(LIB_DIR) -lneo_cs -lneo_utl $(LDFLAGS) #  -lefence
+ 
+-TARGETS = $(CS_LIB) $(CSTEST_EXE) $(CSR_EXE) test
++TARGETS = $(CS_LIB) $(CSR_EXE) $(CSTEST_EXE)
+ 
+ CS_TESTS = test.cs test2.cs test3.cs test4.cs test5.cs test6.cs test7.cs \
+            test8.cs test9.cs test10.cs test11.cs test12.cs test13.cs \
+Index: clearsilver-0.10.3/python/Makefile
+===================================================================
+--- clearsilver-0.10.3.orig/python/Makefile
++++ clearsilver-0.10.3/python/Makefile
+@@ -11,7 +11,7 @@ NEO_UTIL_PYD = neo_cgi.pyd
+ NEO_UTIL_SRC = neo_cgi.c neo_util.c neo_cs.c
+ NEO_UTIL_OBJ = $(NEO_UTIL_SRC:%.c=%.o)
+ 
+-CFLAGS += $(PYTHON_INC)
++#CFLAGS += $(PYTHON_INC)
+ DLIBS += -lneo_cgi -lneo_cs -lneo_utl 
+ LIBS += -L$(LIB_DIR) $(DLIBS) $(DB2_LIB)
+ 
+@@ -21,6 +21,8 @@ else
+ TARGETS = $(NEO_UTIL_SO)
+ endif
+ 
++PYTHON_SITE = /usr/lib/python2.4/site-packages/
++
+ all: $(TARGETS)
+ 
+ $(NEO_UTIL_SO): setup.py $(NEO_UTIL_SRC) $(DEP_LIBS)
diff --git a/packages/meta/unslung-image.bb b/packages/meta/unslung-image.bb
index b21433245a..de27c9236a 100644
--- a/packages/meta/unslung-image.bb
+++ b/packages/meta/unslung-image.bb
@@ -1,5 +1,5 @@
 LICENSE = MIT
-PR = "r15"
+PR = "r16"
 
 IMAGE_BASENAME = "unslung"
 
@@ -73,7 +73,7 @@ unslung_clean_image () {
 
 	#-- these are for cpio:
 	rm -f ${IMAGE_ROOTFS}/usr/bin/mt
-	rm -rf ${IMAGE_ROOTFS}/usr/bin/libexec
+	rm -rf ${IMAGE_ROOTFS}/usr/libexec
 
 	#-- and these for find:
 	rm -f ${IMAGE_ROOTFS}/usr/bin/locate