[nekovm] New upstream version 1.8.2.
Richard W.M. Jones
rjones at fedoraproject.org
Mon Jan 16 13:27:31 UTC 2012
commit 9d46d37ec2557d831139d506d266da03112c4ee8
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Mon Jan 16 13:14:42 2012 +0000
New upstream version 1.8.2.
- Rebase and fix soname patch.
- Run 'make test'.
- A cleaner way to rewrite CFLAGS.
.gitignore | 1 +
nekovm-extra-cflags.patch | 20 +++++++++++++++++
nekovm-set-soname.patch | 51 ++++++++++++++++++++++++++------------------
nekovm.spec | 24 ++++++++++++++++----
sources | 2 +-
5 files changed, 71 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 17eda4b..996161b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
neko-1.8.1.tar.gz
+/neko-1.8.2.tar.gz
diff --git a/nekovm-extra-cflags.patch b/nekovm-extra-cflags.patch
new file mode 100644
index 0000000..d32925b
--- /dev/null
+++ b/nekovm-extra-cflags.patch
@@ -0,0 +1,20 @@
+--- neko-1.8.2/Makefile.orig 2012-01-16 13:25:06.687678254 +0000
++++ neko-1.8.2/Makefile 2012-01-16 13:25:31.605123782 +0000
+@@ -2,7 +2,7 @@
+
+ INSTALL_PREFIX = /usr/local
+
+-CFLAGS = -Wall -O3 -fPIC -fomit-frame-pointer -I vm -D_GNU_SOURCE -msse2 -mfpmath=sse -I libs/common
++CFLAGS = $(EXTRA_CFLAGS) -Wall -O3 -fPIC -fomit-frame-pointer -I vm -D_GNU_SOURCE -msse2 -mfpmath=sse -I libs/common
+ EXTFLAGS = -pthread
+ MAKESO = $(CC) -shared -Wl,-Bsymbolic
+ LIBNEKO_NAME = libneko.so
+@@ -37,7 +37,7 @@
+ # For MINGW/MSYS
+
+ ifeq (${WIN32}, 1)
+-CFLAGS = -g -Wall -O3 -momit-leaf-frame-pointer -I vm -I /usr/local/include -msse2 -mfpmath=sse -I libs/common
++CFLAGS = $(EXTRA_CFLAGS) -g -Wall -O3 -momit-leaf-frame-pointer -I vm -I /usr/local/include -msse2 -mfpmath=sse -I libs/common
+ EXTFLAGS =
+ MAKESO = $(CC) -O -shared
+ LIBNEKO_NAME = neko.dll
diff --git a/nekovm-set-soname.patch b/nekovm-set-soname.patch
index f1999f6..0249323 100644
--- a/nekovm-set-soname.patch
+++ b/nekovm-set-soname.patch
@@ -1,21 +1,30 @@
---- neko-1.8.0/Makefile.orig 2008-12-16 14:56:10.000000000 +0000
-+++ neko-1.8.0/Makefile 2008-12-16 14:56:40.000000000 +0000
-@@ -117,7 +117,8 @@
- (cd src; ${NEKO_EXEC} nekoc -link ../boot/nekoml.n nekoml/Main)
-
- bin/${LIBNEKO_NAME}: ${LIBNEKO_OBJECTS}
-- ${MAKESO} ${EXTFLAGS} -o $@ ${LIBNEKO_OBJECTS} ${LIBNEKO_LIBS}
-+ ${MAKESO} -Wl,-soname,libneko.so.1 ${EXTFLAGS} -o $@ ${LIBNEKO_OBJECTS} ${LIBNEKO_LIBS}
-+ cd bin && ln -s libneko.so libneko.so.1
-
- bin/neko: $(VM_OBJECTS)
- ${CC} ${CFLAGS} ${EXTFLAGS} -o $@ ${VM_OBJECTS} ${NEKOVM_FLAGS}
-@@ -135,7 +135,7 @@
- rm -rf bin/mtypes bin/tools
-
- install:
-- cp bin/${LIBNEKO_NAME} ${INSTALL_PREFIX}/lib
-+ cp bin/${LIBNEKO_NAME} bin/libneko.so.1 ${INSTALL_PREFIX}/lib
- cp bin/neko bin/nekoc bin/nekotools bin/nekoml bin/nekoml.std ${INSTALL_PREFIX}/bin
- -mkdir ${INSTALL_PREFIX}/lib/neko
- cp bin/*.ndll ${INSTALL_PREFIX}/lib/neko
+--- neko-1.8.2.old/Makefile 2011-09-10 09:52:00.000000000 +0100
++++ neko-1.8.2/Makefile 2012-01-16 13:20:50.652100388 +0000
+@@ -4,7 +4,7 @@
+
+ CFLAGS = -Wall -O3 -fPIC -fomit-frame-pointer -I vm -D_GNU_SOURCE -msse2 -mfpmath=sse -I libs/common
+ EXTFLAGS = -pthread
+-MAKESO = $(CC) -shared -WBsymbolic
++MAKESO = $(CC) -shared -Wl,-Bsymbolic
+ LIBNEKO_NAME = libneko.so
+ LIBNEKO_LIBS = -ldl -lgc -lm
+ NEKOVM_FLAGS = -Lbin -lneko
+@@ -118,7 +118,8 @@
+ (cd src; ${NEKO_EXEC} nekoc -link ../boot/nekoml.n nekoml/Main)
+
+ bin/${LIBNEKO_NAME}: ${LIBNEKO_OBJECTS}
+- ${MAKESO} ${EXTFLAGS} -o $@ ${LIBNEKO_OBJECTS} ${LIBNEKO_LIBS}
++ ${MAKESO} -Wl,-soname,libneko.so.1 ${EXTFLAGS} -o $@ ${LIBNEKO_OBJECTS} ${LIBNEKO_LIBS}
++ cd bin && ln -s libneko.so libneko.so.1
+
+ bin/neko: $(VM_OBJECTS)
+ ${CC} ${CFLAGS} ${EXTFLAGS} -o $@ ${VM_OBJECTS} ${NEKOVM_FLAGS}
+@@ -135,7 +136,7 @@
+ rm -rf bin/mtypes bin/tools
+
+ install:
+- cp bin/${LIBNEKO_NAME} ${INSTALL_PREFIX}/lib
++ cp bin/${LIBNEKO_NAME} bin/libneko.so.1 ${INSTALL_PREFIX}/lib
+ cp bin/neko bin/nekoc bin/nekotools bin/nekoml bin/nekoml.std ${INSTALL_PREFIX}/bin
+ -mkdir ${INSTALL_PREFIX}/lib/neko
+ cp bin/*.ndll ${INSTALL_PREFIX}/lib/neko
diff --git a/nekovm.spec b/nekovm.spec
index cefbf9f..fca82cf 100644
--- a/nekovm.spec
+++ b/nekovm.spec
@@ -4,8 +4,8 @@
%define _default_patch_fuzz 2
Name: nekovm
-Version: 1.8.1
-Release: 6%{?dist}
+Version: 1.8.2
+Release: 1%{?dist}
Summary: Neko embedded scripting language and virtual machine
Group: Development/Libraries
@@ -30,6 +30,9 @@ Patch4: nekovm-libmysqlclient.so.patch
# Set the soname correctly on the shared library.
Patch5: nekovm-set-soname.patch
+# Allow extra CFLAGS to be passed.
+Patch6: nekovm-extra-cflags.patch
+
BuildRequires: gc-devel
BuildRequires: pcre-devel
BuildRequires: gtk2-devel
@@ -98,14 +101,19 @@ done
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
%build
# Avoid a compiler stack-overflow when building on 64 bit.
ulimit -s unlimited
-# Add the RPM CFLAGS. Note you need to look at neko's Makefile to
-# find the rest of the flags.
-make CFLAGS="$RPM_OPT_FLAGS -fPIC -I vm -D_GNU_SOURCE"
+
+# Add the RPM flags to CFLAGS.
+make EXTRA_CFLAGS="$RPM_OPT_FLAGS"
+
+
+%check
+make test
%install
@@ -161,6 +169,12 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Jan 16 2012 Richard W.M. Jones <rjones at redhat.com> - 1.8.2-1
+- New upstream version 1.8.2.
+- Rebase and fix soname patch.
+- Run 'make test'.
+- A cleaner way to rewrite CFLAGS.
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index 8caf3e7..dc1b979 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0e2029465a49e1da929f0e254c017701 neko-1.8.1.tar.gz
+bf4872046de59edf4278536ef0240b08 neko-1.8.2.tar.gz
More information about the scm-commits
mailing list