Accepting request 141519 from home:worldcitizen:branches:games

Config diverted from u8500_defconfig config

OBS-URL: https://build.opensuse.org/request/show/141519
OBS-URL: https://build.opensuse.org/package/show/games/angelscript?expand=0&rev=3
This commit is contained in:
Dirk Stoecker 2012-11-16 07:59:32 +00:00 committed by Git OBS Bridge
parent 2f94441ffc
commit addd6022a2
6 changed files with 31 additions and 27 deletions

View File

@ -6,7 +6,7 @@ diff -Naur sdk.orig/angelscript/projects/gnuc/makefile sdk/angelscript/projects/
LOCAL = /usr/local
+# Predefined variables
+VERSION = 2.22.2
+VERSION = 2.25.1
+SONAME = 2
+
# If you want to build a shared library, then run make with SHARED=1 and VERSION=version

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Nov 15 22:14:23 UTC 2012 - joop.boonen@opensuse.org
- Build version 2.25.1
-------------------------------------------------------------------
Wed Apr 4 17:08:10 UTC 2012 - jengelh@medozas.de

View File

@ -17,7 +17,7 @@
Name: angelscript
Version: 2.22.2
Version: 2.25.1
Release: 0
%define soname 2
Summary: It is an extremely flexible cross-platform scripting library
@ -25,6 +25,7 @@ License: Zlib
Group: Development/Libraries/C and C++
Url: http://www.angelcode.com/angelscript/
Source: %{name}_%{version}.zip
# PATCH-FEATURE-UPSTREAM makefile-flags.diff
Patch1: makefile-flags.diff
# PATCH-FIX-OPENSUSE angelscript-makefile.patch fixed soname and build issues
Patch2: %{name}-makefile.patch
@ -56,11 +57,12 @@ It supports Unix sockets and TCP/IP sockets with optional SSL/TLS (OpenSSL) supp
%prep
%setup -qn sdk
%patch -P 1 -P 2 -p1
%patch1 -p1
%patch2 -p1
%build
pushd angelscript/projects/gnuc/
make %{?_smp_mflags} SHARED=1 CXXFLAGS="%optflags"
make %{?_smp_mflags} SHARED=1 CXXFLAGS="%{optflags}"
popd
%install

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:83347de8649924d57e6de8b738faa5c7b6b0f9606ff174691c687cbbe828e8de
size 1164123

3
angelscript_2.25.1.zip Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b1a1d274f7f70f7c32c3d95ebdaf01aeb55cbd6204a03c7e3dda0716c3698143
size 1227976

View File

@ -1,26 +1,23 @@
From: Jan Engelhardt <jengelh@medozas.de>
Date: 2012-04-04 18:58:52.144352570 +0200
Do not touch CXXFLAGS so that it can be overridden by the user.
---
angelscript/projects/gnuc/makefile | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
Index: sdk/angelscript/projects/gnuc/makefile
===================================================================
--- sdk.orig/angelscript/projects/gnuc/makefile
+++ sdk/angelscript/projects/gnuc/makefile
@@ -26,7 +26,7 @@ ifeq ($(TARGETPLATFORM), iphone)
diff -Naur sdk.orig/angelscript/projects/gnuc/makefile sdk/angelscript/projects/gnuc/makefile
--- sdk.orig/angelscript/projects/gnuc/makefile 2012-02-03 20:37:58.000000000 +0100
+++ sdk/angelscript/projects/gnuc/makefile 2012-11-15 23:12:36.000000000 +0100
@@ -21,13 +21,13 @@
OBJDIR = obj-iphone
LIBDIR = ../../lib-iphone
CXX = $(IPHONEBIN)/arm-apple-darwin9-g++-4.0.1
- CXXFLAGS += -g -Wall -fPIC -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS2.2.sdk
+ my_CXXFLAGS += -g -Wall -fPIC -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS2.2.sdk
CXX = $(IPHONEBIN)/clang++
- CXXFLAGS += -O2 -Wall -fPIC -arch armv7 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS5.0.sdk -miphoneos-version-min=3.0
+ my_CXXFLAGS += -O2 -Wall -fPIC -arch armv7 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS5.0.sdk -miphoneos-version-min=3.0
else ifeq ($(TARGETPLATFORM), iphonesimulator)
IPHONEBIN = /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin
OBJDIR = obj-iphone
LIBDIR = ../../lib-iphone
CXX = $(IPHONEBIN)/clang++
- CXXFLAGS += -O2 -Wall -fPIC -arch i386 -isysroot /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator5.0.sdk -miphoneos-version-min=3.0
+ my_CXXFLAGS += -O2 -Wall -fPIC -arch i386 -isysroot /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator5.0.sdk -miphoneos-version-min=3.0
else ifeq ($(TARGETPLATFORM), android)
ANDROIDNDKROOT = /cygdrive/c/android/android-ndk-1.6_r1
ANDROIDBIN = $(ANDROIDNDKROOT)/build/prebuilt/windows/arm-eabi-4.2.1/bin
@@ -34,7 +34,7 @@ else ifeq ($(TARGETPLATFORM), android)
@@ -35,7 +35,7 @@
OBJDIR = obj-android
LIBDIR = ../../lib-android
CXX = $(ANDROIDBIN)/arm-eabi-gcc
@ -29,7 +26,7 @@ Index: sdk/angelscript/projects/gnuc/makefile
-Wall \
-DANDROID \
-fno-exceptions \
@@ -46,7 +46,7 @@ else
@@ -47,7 +47,7 @@
CXX ?= gcc
# On i686 architecture you may need to add -march=i686 if you get
# an undefined symbol for __sync_sub_and_fetch_4 in as_atomic.cpp.
@ -38,7 +35,7 @@ Index: sdk/angelscript/projects/gnuc/makefile
endif
AR ?= ar
@@ -120,13 +120,13 @@ $(LIBDIR):
@@ -122,13 +122,13 @@
mkdir $(LIBDIR)
$(OBJDIR)/%.o: $(SRCDIR)/%.cpp