diff --git a/dev-util/premake/patches/premake-4.3.patch b/dev-util/premake/patches/premake-4.3.patch deleted file mode 100644 index e02982f80..000000000 --- a/dev-util/premake/patches/premake-4.3.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -Naur premake-4.3/build/gmake.unix/Premake4.make premake-4.3-haiku/build/gmake.unix/Premake4.make ---- premake-4.3/build/gmake.unix/Premake4.make 2010-11-16 11:29:14.028311552 +0000 -+++ premake-4.3-haiku/build/gmake.unix/Premake4.make 2012-12-27 23:50:16.043253760 +0000 -@@ -28,8 +28,8 @@ - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) - CFLAGS += $(CPPFLAGS) $(ARCH) -Wall -Os - CXXFLAGS += $(CFLAGS) -- LDFLAGS += -s -rdynamic -- LIBS += -lm -ldl -+ LDFLAGS += -s -+ LIBS += - RESFLAGS += $(DEFINES) $(INCLUDES) - LDDEPS += - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS) -diff -Naur premake-4.3/src/host/lua-5.1.4/src/luaconf.h premake-4.3-haiku/src/host/lua-5.1.4/src/luaconf.h ---- premake-4.3/src/host/lua-5.1.4/src/luaconf.h 2010-11-16 11:29:12.042991616 +0000 -+++ premake-4.3-haiku/src/host/lua-5.1.4/src/luaconf.h 2012-12-27 23:50:16.050331648 +0000 -@@ -55,7 +55,6 @@ - #define LUA_USE_MKSTEMP - #define LUA_USE_ISATTY - #define LUA_USE_POPEN --#define LUA_USE_ULONGJMP - #endif - - -diff -Naur premake-4.3/src/host/premake.h premake-4.3-haiku/src/host/premake.h ---- premake-4.3/src/host/premake.h 2010-11-16 11:29:12.047185920 +0000 -+++ premake-4.3-haiku/src/host/premake.h 2012-12-27 23:50:16.052166656 +0000 -@@ -12,7 +12,7 @@ - - /* Identify the current platform I'm not sure how to reliably detect - * Windows but since it is the most common I use it as the default */ --#if defined(__linux__) -+#if defined(__linux__) || defined(__HAIKU__) - #define PLATFORM_LINUX (1) - #define PLATFORM_STRING "linux" - #elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) diff --git a/dev-util/premake/patches/premake-4.3.patchset b/dev-util/premake/patches/premake-4.3.patchset new file mode 100644 index 000000000..75f9cdc9e --- /dev/null +++ b/dev-util/premake/patches/premake-4.3.patchset @@ -0,0 +1,54 @@ +From 24fb42f5d8c5e23290a9e22d577174a6151f4a6e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= + +Date: Wed, 7 Jan 2015 16:17:46 +0000 +Subject: Fixing Premake4 + + +diff --git a/build/gmake.unix/Premake4.make b/build/gmake.unix/Premake4.make +index bbc159b..7cb8ce5 100644 +--- a/build/gmake.unix/Premake4.make ++++ b/build/gmake.unix/Premake4.make +@@ -28,8 +28,8 @@ ifeq ($(config),release) + CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) + CFLAGS += $(CPPFLAGS) $(ARCH) -Wall -Os + CXXFLAGS += $(CFLAGS) +- LDFLAGS += -s -rdynamic +- LIBS += -lm -ldl ++ LDFLAGS += -s ++ LIBS += -lbe -lroot -ltracker + RESFLAGS += $(DEFINES) $(INCLUDES) + LDDEPS += + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS) +diff --git a/src/host/lua-5.1.4/src/luaconf.h b/src/host/lua-5.1.4/src/luaconf.h +index e2cb261..b702731 100644 +--- a/src/host/lua-5.1.4/src/luaconf.h ++++ b/src/host/lua-5.1.4/src/luaconf.h +@@ -55,8 +55,10 @@ + #define LUA_USE_MKSTEMP + #define LUA_USE_ISATTY + #define LUA_USE_POPEN ++#ifndef __HAIKU__ + #define LUA_USE_ULONGJMP + #endif ++#endif + + + /* +diff --git a/src/host/premake.h b/src/host/premake.h +index 4358b18..72371e1 100644 +--- a/src/host/premake.h ++++ b/src/host/premake.h +@@ -24,6 +24,9 @@ + #elif defined(__sun__) && defined(__svr4__) + #define PLATFORM_SOLARIS (1) + #define PLATFORM_STRING "solaris" ++#elif defined(__HAIKU__) ++#define PLATFORM_LINUX (1) ++#define PLATFORM_STRING "haiku" + #else + #define PLATFORM_WINDOWS (1) + #define PLATFORM_STRING "windows" +-- +1.8.3.4 + diff --git a/dev-util/premake/premake-4.3.recipe b/dev-util/premake/premake-4.3.recipe index d01ce86be..eef25d8d6 100644 --- a/dev-util/premake/premake-4.3.recipe +++ b/dev-util/premake/premake-4.3.recipe @@ -1,23 +1,57 @@ -DESCRIPTION="Powerfully simple build configuration" +SUMMARY="Powerfully simple build configuration" +DESCRIPTION=" +Describe your software project with a full-featured scripting language and \ +let Premake write the build scripts for you. With one file your project can \ +support both IDE-addicted Windows coders and Linux command-line junkies! +" HOMEPAGE="http://industriousone.com/premake" SRC_URI="http://sourceforge.net/projects/premake/files/Premake/4.3/premake-4.3-src.zip/download" -CHECKSUM_MD5="8cfafee76f9665c93b2e9ad15b015eb7" +CHECKSUM_SHA256="36536490f8928d8ecde135da80cd8b751ea5bebe50cabba5c0de49cd41cb2780" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +LICENSE="BSD (2-clause)" +COPYRIGHT="2012 Industrious One, LLC" + +ARCHITECTURES="x86 ?x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + premake4$secondaryArchSuffix = $portVersion + cmd:premake4$secondaryArchSuffix = $portVersion +" + +REQUIRES=" + haiku$secondaryArchSuffix +" + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel +" + +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make +" + +SOURCE_DIR="premake-4.3" + +PATCHES="premake-4.3.patchset" BUILD() { - cd premake-4.3/build/gmake.unix + cd build/gmake.unix make config=release } INSTALL() { - cd premake-4.3/bin/release - mkdir -p $DESTDIR`finddir B_COMMON_BIN_DIRECTORY` - install -m 0755 premake4 $DESTDIR`finddir B_COMMON_BIN_DIRECTORY` + cd bin/release + mkdir -p $binDir + install -m 0755 premake4 $binDir } -LICENSE="BSD (2-clause)" -COPYRIGHT="2012 Industrious One, LLC"