[csw-devel] SF.net SVN: gar:[9076] csw/mgar/pkg/awesome/trunk
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Wed Mar 10 12:35:45 CET 2010
Revision: 9076
http://gar.svn.sourceforge.net/gar/?rev=9076&view=rev
Author: wahwah
Date: 2010-03-10 11:35:45 +0000 (Wed, 10 Mar 2010)
Log Message:
-----------
awesome: I got it to build on Solaris 10.
Modified Paths:
--------------
csw/mgar/pkg/awesome/trunk/Makefile
csw/mgar/pkg/awesome/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/awesome/trunk/files/iconv-try-1.patch
csw/mgar/pkg/awesome/trunk/files/remove-export-dynamic.patch
csw/mgar/pkg/awesome/trunk/files/test-dash-e-unavailable.patch
csw/mgar/pkg/awesome/trunk/files/turn-off-rpath-breakage.patch
Removed Paths:
-------------
csw/mgar/pkg/awesome/trunk/files/awesomeConfig.cmake.patch
Modified: csw/mgar/pkg/awesome/trunk/Makefile
===================================================================
--- csw/mgar/pkg/awesome/trunk/Makefile 2010-03-10 09:28:45 UTC (rev 9075)
+++ csw/mgar/pkg/awesome/trunk/Makefile 2010-03-10 11:35:45 UTC (rev 9076)
@@ -20,13 +20,40 @@
# EXTRA_LD_OPTIONS = -L/opt/csw/lib -liconv
# EXTRA_CFLAGS = -xc99 -DCE
# EXTRA_CXXFLAGS = -xc99 -DCEPLUSPLUS
+TEST_SCRIPTS =
+EXTRA_INC = /opt/csw/X11/include
+EXTRA_LIB = /opt/csw/X11/lib
BUILD_DEP_PKGS += CSWlua CSWgperf CSWlibdbusdev
EXTRA_PKG_CONFIG_PATH += /opt/csw/X11/lib/pkgconfig
PATCHFILES += gperf.sh-solarify.patch
PATCHFILES += backtrace.c.patch
-PATCHFILES += awesomeConfig.cmake.patch
+PATCHFILES += iconv-try-1.patch
+# PATCHFILES += libiconv.patch
+PATCHFILES += test-dash-e-unavailable.patch
+PATCHFILES += remove-export-dynamic.patch
+CMAKE_ARGS = -DSYSCONFDIR=/etc/opt/csw
+CMAKE_ARGS += -DPREFIX=/opt/csw
+export CMAKE_ARGS
+
+RUNTIME_DEP_PKGS_CSWawesome += CSWggettextrt
+RUNTIME_DEP_PKGS_CSWawesome += CSWglib2
+RUNTIME_DEP_PKGS_CSWawesome += CSWiconv
+RUNTIME_DEP_PKGS_CSWawesome += CSWimlib2
+RUNTIME_DEP_PKGS_CSWawesome += CSWlibcairo
+RUNTIME_DEP_PKGS_CSWawesome += CSWlibdbus
+RUNTIME_DEP_PKGS_CSWawesome += CSWlibev
+RUNTIME_DEP_PKGS_CSWawesome += CSWlibx11
+RUNTIME_DEP_PKGS_CSWawesome += CSWlibxcb
+RUNTIME_DEP_PKGS_CSWawesome += CSWlibxdgbasedir
+RUNTIME_DEP_PKGS_CSWawesome += CSWlua
+RUNTIME_DEP_PKGS_CSWawesome += CSWpango
+RUNTIME_DEP_PKGS_CSWawesome += CSWstartupnotif
+RUNTIME_DEP_PKGS_CSWawesome += CSWxcbutil
+
+LICENSE = LICENSE
+
include gar/category.mk
build-awesome:
@@ -38,3 +65,4 @@
@$(MAKECOOKIE)
PATH := /opt/csw/gnu:$(PATH)
+# PATCHFILES += turn-off-rpath-breakage.patch
Modified: csw/mgar/pkg/awesome/trunk/checksums
===================================================================
--- csw/mgar/pkg/awesome/trunk/checksums 2010-03-10 09:28:45 UTC (rev 9075)
+++ csw/mgar/pkg/awesome/trunk/checksums 2010-03-10 11:35:45 UTC (rev 9076)
@@ -1,3 +1,6 @@
8c2537ad898d7f58a0f3ba92e6a561a1 awesome-3.4.4.tar.bz2
1d5c67eb4555b367032c1294fb72bf0b backtrace.c.patch
346c2299f6f5be4d667ff3769a1251f0 gperf.sh-solarify.patch
+3186b1d530e691611c9da0443689b5e4 iconv-try-1.patch
+9201583f764cb4859e6a49c883dd6672 remove-export-dynamic.patch
+346d88270c8702b7f4d7ab519d7ccc07 test-dash-e-unavailable.patch
Deleted: csw/mgar/pkg/awesome/trunk/files/awesomeConfig.cmake.patch
===================================================================
--- csw/mgar/pkg/awesome/trunk/files/awesomeConfig.cmake.patch 2010-03-10 09:28:45 UTC (rev 9075)
+++ csw/mgar/pkg/awesome/trunk/files/awesomeConfig.cmake.patch 2010-03-10 11:35:45 UTC (rev 9076)
@@ -1,20 +0,0 @@
---- awesome-3.4.4/awesomeConfig.cmake.orig 2010-03-09 18:53:40.270578634 +0100
-+++ awesome-3.4.4/awesomeConfig.cmake 2010-03-09 18:55:57.683822917 +0100
-@@ -167,6 +167,7 @@
-
- # Check for libev
- a_find_library(LIB_EV ev)
-+a_find_library(LIB_ICONV iconv)
-
- # Error check
- if(NOT LUA51_FOUND AND NOT LUA50_FOUND) # This is a workaround to a cmake bug
-@@ -177,7 +178,8 @@
- ${AWESOME_COMMON_REQUIRED_LDFLAGS}
- ${AWESOME_REQUIRED_LIBRARIES}
- ${LIB_EV}
-- ${LUA_LIBRARIES})
-+ ${LUA_LIBRARIES}
-+ ${LIB_ICONV})
-
- set(AWESOME_REQUIRED_INCLUDE_DIRS
- ${AWESOME_COMMON_REQUIRED_INCLUDE_DIRS}
Added: csw/mgar/pkg/awesome/trunk/files/iconv-try-1.patch
===================================================================
--- csw/mgar/pkg/awesome/trunk/files/iconv-try-1.patch (rev 0)
+++ csw/mgar/pkg/awesome/trunk/files/iconv-try-1.patch 2010-03-10 11:35:45 UTC (rev 9076)
@@ -0,0 +1,20 @@
+--- awesome-3.4.4/awesomeConfig.cmake.orig 2010-03-09 18:53:40.270578634 +0100
++++ awesome-3.4.4/awesomeConfig.cmake 2010-03-09 18:55:57.683822917 +0100
+@@ -167,6 +167,7 @@
+
+ # Check for libev
+ a_find_library(LIB_EV ev)
++a_find_library(LIB_ICONV iconv)
+
+ # Error check
+ if(NOT LUA51_FOUND AND NOT LUA50_FOUND) # This is a workaround to a cmake bug
+@@ -177,7 +178,8 @@
+ ${AWESOME_COMMON_REQUIRED_LDFLAGS}
+ ${AWESOME_REQUIRED_LIBRARIES}
+ ${LIB_EV}
+- ${LUA_LIBRARIES})
++ ${LUA_LIBRARIES}
++ ${LIB_ICONV})
+
+ set(AWESOME_REQUIRED_INCLUDE_DIRS
+ ${AWESOME_COMMON_REQUIRED_INCLUDE_DIRS}
Added: csw/mgar/pkg/awesome/trunk/files/remove-export-dynamic.patch
===================================================================
--- csw/mgar/pkg/awesome/trunk/files/remove-export-dynamic.patch (rev 0)
+++ csw/mgar/pkg/awesome/trunk/files/remove-export-dynamic.patch 2010-03-10 11:35:45 UTC (rev 9076)
@@ -0,0 +1,13 @@
+--- awesome-3.4.4/CMakeLists.txt.orig 2010-03-10 11:23:26.685134271 +0100
++++ awesome-3.4.4/CMakeLists.txt 2010-03-10 11:23:58.858789913 +0100
+@@ -93,10 +93,6 @@
+ ${AWE_SRCS}
+ ${BUILD_DIR}/common/tokenize.c)
+
+-set_target_properties(${PROJECT_AWE_NAME}
+- PROPERTIES
+- LINK_FLAGS -export-dynamic)
+-
+ target_link_libraries(${PROJECT_AWE_NAME}
+ ${AWESOME_COMMON_REQUIRED_LIBRARIES}
+ ${AWESOME_REQUIRED_LIBRARIES}
Added: csw/mgar/pkg/awesome/trunk/files/test-dash-e-unavailable.patch
===================================================================
--- csw/mgar/pkg/awesome/trunk/files/test-dash-e-unavailable.patch (rev 0)
+++ csw/mgar/pkg/awesome/trunk/files/test-dash-e-unavailable.patch 2010-03-10 11:35:45 UTC (rev 9076)
@@ -0,0 +1,11 @@
+--- awesome-3.4.4/Makefile.orig 2010-03-10 11:35:56.642761333 +0100
++++ awesome-3.4.4/Makefile 2010-03-10 11:36:11.939322719 +0100
+@@ -16,7 +16,7 @@
+ ln -s -f ${builddir}/$@ $@
+
+ $(BUILDLN):
+- test -e $(BUILDLN) || ln -s -f ${builddir} $(BUILDLN)
++ test -h $(BUILDLN) || ln -s -f ${builddir} $(BUILDLN)
+
+ cmake ${builddir}/CMakeCache.txt:
+ mkdir -p ${builddir}
Added: csw/mgar/pkg/awesome/trunk/files/turn-off-rpath-breakage.patch
===================================================================
--- csw/mgar/pkg/awesome/trunk/files/turn-off-rpath-breakage.patch (rev 0)
+++ csw/mgar/pkg/awesome/trunk/files/turn-off-rpath-breakage.patch 2010-03-10 11:35:45 UTC (rev 9076)
@@ -0,0 +1,10 @@
+--- awesome-3.4.4/awesomeConfig.cmake.orig 2010-03-10 12:24:06.477524567 +0100
++++ awesome-3.4.4/awesomeConfig.cmake 2010-03-10 12:24:34.307159286 +0100
+@@ -9,6 +9,7 @@
+ project(${PROJECT_AWE_NAME} C)
+
+ set(CMAKE_BUILD_TYPE RELEASE)
++set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+
+ option(WITH_DBUS "build with D-BUS" ON)
+ option(GENERATE_MANPAGES "generate manpages" ON)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list