mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 12:10:06 +02:00
Using SED for patches
This commit is contained in:
@@ -1,39 +0,0 @@
|
||||
From 0621b3e542f32146cea8177b128665e0aa7d44b9 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?=
|
||||
<adrian.arroyocalle@gmail.com>
|
||||
Date: Thu, 8 Jan 2015 18:10:54 +0000
|
||||
Subject: Finxing Haiku build
|
||||
|
||||
|
||||
diff --git a/build/gmake.unix/Premake4.make b/build/gmake.unix/Premake4.make
|
||||
index 5b8e979..314879c 100644
|
||||
--- a/build/gmake.unix/Premake4.make
|
||||
+++ b/build/gmake.unix/Premake4.make
|
||||
@@ -29,9 +29,9 @@ ifeq ($(config),release)
|
||||
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os
|
||||
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS)
|
||||
ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
|
||||
- ALL_LDFLAGS += $(LDFLAGS) -L. -s -rdynamic
|
||||
+ ALL_LDFLAGS += $(LDFLAGS) -L. -s
|
||||
LDDEPS +=
|
||||
- LIBS += $(LDDEPS) -lm -ldl
|
||||
+ LIBS += $(LDDEPS)
|
||||
LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
|
||||
define PREBUILDCMDS
|
||||
endef
|
||||
diff --git a/src/host/lua-5.1.4/src/luaconf.h b/src/host/lua-5.1.4/src/luaconf.h
|
||||
index e2cb261..e2c6418 100644
|
||||
--- a/src/host/lua-5.1.4/src/luaconf.h
|
||||
+++ b/src/host/lua-5.1.4/src/luaconf.h
|
||||
@@ -55,7 +55,7 @@
|
||||
#define LUA_USE_MKSTEMP
|
||||
#define LUA_USE_ISATTY
|
||||
#define LUA_USE_POPEN
|
||||
-#define LUA_USE_ULONGJMP
|
||||
+/* #define LUA_USE_ULONGJMP */
|
||||
#endif
|
||||
|
||||
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
@@ -41,7 +41,12 @@ BUILD_PREREQUIRES="
|
||||
|
||||
SOURCE_DIR="premake-4.4-beta5"
|
||||
|
||||
PATCHES="premake-4.4-beta5.patchset"
|
||||
PATCH()
|
||||
{
|
||||
sed -i '/#define LUA_USE_ULONGJMP/d' src/host/lua-5.1.4/src/luaconf.h
|
||||
sed -i '/-lm/d' build/gmake.unix/Premake4.make
|
||||
sed -i 's/-rdynamic//g' build/gmake.unix/Premake4.make
|
||||
}
|
||||
|
||||
BUILD()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user