[arch-commits] Commit in neko/trunk (PKGBUILD gtk3.patch)
Date: Tuesday, December 22, 2020 @ 13:33:03
Author: arodseth
Revision: 781977
Use patch instead of sed
Added:
neko/trunk/gtk3.patch
Modified:
neko/trunk/PKGBUILD
+
PKGBUILD | 17 ++--
gtk3.patch | 235 +++
2 files changed, 243 insertions(+), 9 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-12-22 13:31:36 UTC (rev 781976)
+++ PKGBUILD2020-12-22 13:33:03 UTC (rev 781977)
@@ -9,7 +9,7 @@
pkgname=neko
pkgver=2.3.0
-pkgrel=2
+pkgrel=3
pkgdesc='High-level and dynamically typed programming language'
url='https://nekovm.org/'
license=(LGPL)
@@ -18,16 +18,15 @@
makedepends=(apache apr cmake git mbedtls ninja)
optdepends=('apache: for extending Apache with mod_neko')
options=(!strip)
-source=("git+https://github.com/HaxeFoundation/neko#tag=v${pkgver//./-}";)
-sha256sums=('SKIP')
+source=("git+https://github.com/HaxeFoundation/neko#tag=v${pkgver//./-}";
+gtk3.patch)
+sha256sums=('SKIP'
+'c2e5428fffd5eec737c5ce6f165e2cb38f3943340dd24a06b8f39db7b6b7c544')
prepare() {
- sed -i '/xlocale.h/d' $pkgname/libs/std/sys.c
-
- # Port to GTK 3
- mv $pkgname/cmake/FindGTK2.cmake $pkgname/cmake/FindGTK3.cmake
- sed -i 's/gtk_timeout_add/gdk_threads_add_timeout/g' $pkgname/libs/ui/ui.c
- find $pkgname -type f -exec sed -i
's/gtk2/gtk3/g;s/GTK2/GTK3/g;s/gtk-2/gtk-3/g;s/GTK-2/GTK-3/g;s/gtk+-2/gtk+-3/g;s/GTK+-2/GTK+-3/g'
{} \;
+ cd $pkgname
+ sed -i '/xlocale.h/d' libs/std/sys.c
+ patch -p1 -i ../gtk3.patch
}
build() {
Added: gtk3.patch
===
--- gtk3.patch (rev 0)
+++ gtk3.patch 2020-12-22 13:33:03 UTC (rev 781977)
@@ -0,0 +1,235 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 930c1ab..0e150cb 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -44,7 +44,7 @@ set(NEKO_VERSION
${NEKO_VERSION_MAJOR}.${NEKO_VERSION_MINOR}.${NEKO_VERSION_PATC
+ TEST_BIG_ENDIAN(NEKO_BIG_ENDIAN)
+
+ option(WITH_REGEXP "Build Perl-compatible regex support." ON)
+-option(WITH_UI "Build GTK-2 UI support." ON)
++option(WITH_UI "Build GTK-3 UI support." ON)
+ option(WITH_SSL "Build SSL support." ON)
+ option(WITH_MYSQL "Build MySQL support." ON)
+ option(WITH_SQLITE "Build Sqlite support." ON)
+diff --git a/README.md b/README.md
+index 70c16b3..3965608 100644
+--- a/README.md
b/README.md
+@@ -25,7 +25,7 @@ Users of other Linux/FreeBSD distributions should build Neko
from source. See be
+
+ Neko can be built using CMake (version 3.x is recommended) and one of the C
compilers listed as follows:
+
+- * Windows: Visual Studio 2010 / 2013 / 2015 / 2017
++ * Windows: Visual Studio 2010 / 2013 / 2015 / 2017
+ * Mac: XCode (with its "Command line tools")
+ * Linux: gcc (can be obtained by installing the "build-essential"
Debian/Ubuntu package)
+
+@@ -41,7 +41,7 @@ Neko needs to link with various third-party libraries, which
are summarized as f
+ | MariaDB / MySQL (Connector/C) | all |
libmariadb-client-lgpl-dev-compat (or libmysqlclient-dev) |
+ | SQLite | all | libsqlite3-dev
|
+ | mbed TLS| all | libmbedtls-dev
|
+-| GTK+2 | Linux | libgtk2.0-dev
|
++| GTK+3 | Linux | libgtk-3-dev
|
+
+ On Windows, CMake will automatically download and build the libraries in the
build folder during the build process. However, you need to install
[Perl](http://www.activestate.com/activeperl) manually because OpenSSL needs it
for configuration. On Mac/Linux, you should install the libraries manually to
your system before building Neko, or use the `STATIC_DEPS` CMake option, which
will be explained in [CMake options](#cmake-options).
+
+@@ -73,7 +73,7 @@ You may use the CMake GUI and Visual Studio to build it
instead.
+ mkdir build
+ cd build
+
+-# run cmake specifying the visual studio version you need
++# run cmake specifying the visual studio version you need
+ # Visual Studio 12 2013, Visual Studio 14 2015, Visual Studio 15 2017
+ # you can additionally specify platform via -A switch (x86, x64)
+ cmake -G "Visual Studio 12 2013" ..
+@@ -99,7 +99,7 @@ cmake "-Doption=value" ..
+ Settings that allow to exclude libraries and their dependencies from the
build; available on all platforms. By default all are `ON`:
+
+ - `WITH_REGEXP` - Build Perl-compatible regex support
+-- `WITH_UI` - Build GTK-2 UI support
++- `WITH_UI` - Build GTK-3 UI support
+ - `WITH_SSL` - Build SSL support
+ - `WITH_MYSQL` - Build MySQL support
+ - `WITH_SQLITE` - Build Sqlite support
+@@ -113,7 +113,7 @@ It defines the depen
[arch-commits] Commit in neko/trunk (PKGBUILD)
Date: Tuesday, December 22, 2020 @ 12:37:58
Author: arodseth
Revision: 781961
Use gtk3
Modified:
neko/trunk/PKGBUILD
--+
PKGBUILD | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-12-22 12:27:10 UTC (rev 781960)
+++ PKGBUILD2020-12-22 12:37:58 UTC (rev 781961)
@@ -9,12 +9,12 @@
pkgname=neko
pkgver=2.3.0
-pkgrel=1
+pkgrel=2
pkgdesc='High-level and dynamically typed programming language'
url='https://nekovm.org/'
license=(LGPL)
arch=(x86_64)
-depends=(gc gtk2 mariadb-libs mbedtls sqlite)
+depends=(gc gtk3 mariadb-libs mbedtls sqlite)
makedepends=(apache apr cmake git mbedtls ninja)
optdepends=('apache: for extending Apache with mod_neko')
options=(!strip)
@@ -23,6 +23,11 @@
prepare() {
sed -i '/xlocale.h/d' $pkgname/libs/std/sys.c
+
+ # Port to GTK 3
+ mv $pkgname/cmake/FindGTK2.cmake $pkgname/cmake/FindGTK3.cmake
+ sed -i 's/gtk_timeout_add/gdk_threads_add_timeout/g' $pkgname/libs/ui/ui.c
+ find $pkgname -type f -exec sed -i
's/gtk2/gtk3/g;s/GTK2/GTK3/g;s/gtk-2/gtk-3/g;s/GTK-2/GTK-3/g;s/gtk+-2/gtk+-3/g;s/GTK+-2/GTK+-3/g'
{} \;
}
build() {
@@ -40,4 +45,3 @@
}
# getver: nekovm.org/download
-# vim: ts=2 sw=2 et:
[arch-commits] Commit in neko/trunk (PKGBUILD)
Date: Sunday, October 27, 2019 @ 11:43:40 Author: arodseth Revision: 520742 upgpkg: neko 2.3.0-1 Modified: neko/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-10-27 11:36:16 UTC (rev 520741) +++ PKGBUILD2019-10-27 11:43:40 UTC (rev 520742) @@ -8,8 +8,8 @@ # Contributor: Christian Hesse pkgname=neko -pkgver=2.2.0 -pkgrel=6 +pkgver=2.3.0 +pkgrel=1 pkgdesc='High-level and dynamically typed programming language' url='https://nekovm.org/' license=(LGPL)
[arch-commits] Commit in neko/trunk (PKGBUILD)
Date: Thursday, February 21, 2019 @ 11:31:52
Author: arodseth
Revision: 434971
upgpkg: neko 2.2.0-6
Modified:
neko/trunk/PKGBUILD
--+
PKGBUILD | 19 +--
1 file changed, 9 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-02-21 11:15:18 UTC (rev 434970)
+++ PKGBUILD2019-02-21 11:31:52 UTC (rev 434971)
@@ -1,4 +1,4 @@
-# Maintainer: Alexander F Rødseth
+# Maintainer: Alexander F. Rødseth
# Contributor: Daichi Shinozaki
# Contributor: Dwight Schauer
# Contributor: Stefan Husmann
@@ -9,26 +9,25 @@
pkgname=neko
pkgver=2.2.0
-pkgrel=5
+pkgrel=6
pkgdesc='High-level and dynamically typed programming language'
-url='http://nekovm.org/' # no https
-license=('LGPL')
-arch=('x86_64')
-depends=('gc' 'gtk2' 'mariadb-libs' 'mbedtls' 'sqlite')
-makedepends=('apache' 'apr' 'cmake' 'git' 'mbedtls' 'ninja')
+url='https://nekovm.org/'
+license=(LGPL)
+arch=(x86_64)
+depends=(gc gtk2 mariadb-libs mbedtls sqlite)
+makedepends=(apache apr cmake git mbedtls ninja)
optdepends=('apache: for extending Apache with mod_neko')
-options=('!strip')
+options=(!strip)
source=("git+https://github.com/HaxeFoundation/neko#tag=v${pkgver//./-}";)
sha256sums=('SKIP')
prepare() {
- sed -i '/xlocale.h/d' "$pkgname/libs/std/sys.c"
+ sed -i '/xlocale.h/d' $pkgname/libs/std/sys.c
}
build() {
mkdir -p build
cd build
-
cmake ../$pkgname \
-DCMAKE_INSTALL_PREFIX=/usr \
-DRUN_LDCONFIG=OFF \
[arch-commits] Commit in neko/trunk (PKGBUILD)
Date: Wednesday, January 16, 2019 @ 14:42:17
Author: foutrelis
Revision: 423513
MariaDB 10.3 rebuild
Modified:
neko/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-01-16 14:27:03 UTC (rev 423512)
+++ PKGBUILD2019-01-16 14:42:17 UTC (rev 423513)
@@ -9,7 +9,7 @@
pkgname=neko
pkgver=2.2.0
-pkgrel=4
+pkgrel=5
pkgdesc='High-level and dynamically typed programming language'
url='http://nekovm.org/' # no https
license=('LGPL')
[arch-commits] Commit in neko/trunk (PKGBUILD)
Date: Saturday, September 22, 2018 @ 15:05:51
Author: kkeen
Revision: 384148
upgpkg: neko 2.2.0-4 mbedtls rebuild
Modified:
neko/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-09-22 14:57:03 UTC (rev 384147)
+++ PKGBUILD2018-09-22 15:05:51 UTC (rev 384148)
@@ -9,7 +9,7 @@
pkgname=neko
pkgver=2.2.0
-pkgrel=3
+pkgrel=4
pkgdesc='High-level and dynamically typed programming language'
url='http://nekovm.org/' # no https
license=('LGPL')
[arch-commits] Commit in neko/trunk (PKGBUILD)
Date: Sunday, August 19, 2018 @ 03:05:26
Author: kkeen
Revision: 372739
upgpkg: neko 2.2.0-3 mbedtls rebuild
Modified:
neko/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-08-19 02:54:09 UTC (rev 372738)
+++ PKGBUILD2018-08-19 03:05:26 UTC (rev 372739)
@@ -9,7 +9,7 @@
pkgname=neko
pkgver=2.2.0
-pkgrel=2
+pkgrel=3
pkgdesc='High-level and dynamically typed programming language'
url='http://nekovm.org/' # no https
license=('LGPL')
[arch-commits] Commit in neko/trunk (PKGBUILD)
Date: Thursday, February 8, 2018 @ 23:50:53
Author: kkeen
Revision: 290426
mbedtls 2.7.0 rebuild
Modified:
neko/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-02-08 23:48:19 UTC (rev 290425)
+++ PKGBUILD2018-02-08 23:50:53 UTC (rev 290426)
@@ -9,7 +9,7 @@
pkgname=neko
pkgver=2.2.0
-pkgrel=1
+pkgrel=2
pkgdesc='High-level and dynamically typed programming language'
url='http://nekovm.org/' # no https
license=('LGPL')
[arch-commits] Commit in neko/trunk (PKGBUILD)
Date: Thursday, January 11, 2018 @ 12:18:02
Author: arodseth
Revision: 281321
upgpkg: neko 2.2.0-1
Modified:
neko/trunk/PKGBUILD
--+
PKGBUILD |8
1 file changed, 4 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-01-11 12:17:32 UTC (rev 281320)
+++ PKGBUILD2018-01-11 12:18:02 UTC (rev 281321)
@@ -8,14 +8,14 @@
# Contributor: Christian Hesse
pkgname=neko
-pkgver=2.1.0
-pkgrel=3
+pkgver=2.2.0
+pkgrel=1
pkgdesc='High-level and dynamically typed programming language'
url='http://nekovm.org/' # no https
license=('LGPL')
arch=('x86_64')
depends=('gc' 'gtk2' 'libmariadbclient' 'mbedtls' 'sqlite')
-makedepends=('apache' 'apr' 'cmake' 'git' 'mbedtls' 'ninja' 'pkgconfig')
+makedepends=('apache' 'apr' 'cmake' 'git' 'mbedtls' 'ninja')
optdepends=('apache: for extending Apache with mod_neko')
options=('!strip')
source=("git+https://github.com/HaxeFoundation/neko#tag=v${pkgver//./-}";)
@@ -22,7 +22,7 @@
sha256sums=('SKIP')
prepare() {
- sed -i '/xlocale.h/d' "$srcdir/$pkgname/libs/std/sys.c"
+ sed -i '/xlocale.h/d' "$pkgname/libs/std/sys.c"
}
build() {
[arch-commits] Commit in neko/trunk (PKGBUILD)
Date: Monday, October 30, 2017 @ 14:10:05
Author: arodseth
Revision: 264785
upgpkg: neko 2.1.0-3
Modified:
neko/trunk/PKGBUILD
--+
PKGBUILD | 21 +
1 file changed, 13 insertions(+), 8 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-10-30 14:06:07 UTC (rev 264784)
+++ PKGBUILD2017-10-30 14:10:05 UTC (rev 264785)
@@ -9,22 +9,27 @@
pkgname=neko
pkgver=2.1.0
-pkgrel=2
-pkgdesc='High-level dynamically typed programming language'
-url='http://nekovm.org/'
+pkgrel=3
+pkgdesc='High-level and dynamically typed programming language'
+url='http://nekovm.org/' # no https
license=('LGPL')
arch=('x86_64' 'i686')
-depends=('gc' 'gtk2' 'libmariadbclient' 'sqlite' 'apache' 'mbedtls')
-makedepends=('pkgconfig' 'apr' 'git' 'ninja' 'mbedtls' 'cmake')
+depends=('gc' 'gtk2' 'libmariadbclient' 'mbedtls' 'sqlite')
+makedepends=('apache' 'apr' 'cmake' 'git' 'mbedtls' 'ninja' 'pkgconfig')
+optdepends=('apache: for extending Apache with mod_neko')
options=('!strip')
-source=("git://github.com/HaxeFoundation/neko#tag=v${pkgver//./-}")
+source=("git+https://github.com/HaxeFoundation/neko#tag=v${pkgver//./-}";)
sha256sums=('SKIP')
+prepare() {
+ sed -i '/xlocale.h/d' "$srcdir/$pkgname/libs/std/sys.c"
+}
+
build() {
mkdir -p build
cd build
- cmake "../$pkgname" \
+ cmake ../$pkgname \
-DCMAKE_INSTALL_PREFIX=/usr \
-DRUN_LDCONFIG=OFF \
-GNinja
@@ -36,4 +41,4 @@
}
# getver: nekovm.org/download
-# vim:set ts=2 sw=2 et:
+# vim: ts=2 sw=2 et:
[arch-commits] Commit in neko/trunk (PKGBUILD)
Date: Friday, May 26, 2017 @ 08:52:26
Author: foutrelis
Revision: 230417
MariaDB 10.2.6 rebuild
Modified:
neko/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-05-26 08:42:25 UTC (rev 230416)
+++ PKGBUILD2017-05-26 08:52:26 UTC (rev 230417)
@@ -9,7 +9,7 @@
pkgname=neko
pkgver=2.1.0
-pkgrel=1
+pkgrel=2
pkgdesc='High-level dynamically typed programming language'
url='http://nekovm.org/'
license=('LGPL')
[arch-commits] Commit in neko/trunk (PKGBUILD)
Date: Tuesday, June 28, 2016 @ 14:11:53 Author: arodseth Revision: 181501 upgpkg: neko 2.1.0-1 Modified: neko/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-06-28 12:04:21 UTC (rev 181500) +++ PKGBUILD2016-06-28 14:11:53 UTC (rev 181501) @@ -26,7 +26,7 @@ cmake "../$pkgname" \ -DCMAKE_INSTALL_PREFIX=/usr \ --DCMAKE_INSTALL_LIBDIR=lib \ +-DRUN_LDCONFIG=OFF \ -GNinja ninja }
[arch-commits] Commit in neko/trunk (PKGBUILD)
Date: Saturday, May 14, 2016 @ 16:33:26
Author: arodseth
Revision: 175385
upgpkg: neko 2.1.0-1
Modified:
neko/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-05-14 14:33:09 UTC (rev 175384)
+++ PKGBUILD2016-05-14 14:33:26 UTC (rev 175385)
@@ -23,10 +23,10 @@
build() {
mkdir -p build
cd build
+
cmake "../$pkgname" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
--DRUN_LDCONFIG=OFF \
-GNinja
ninja
}
[arch-commits] Commit in neko/trunk (PKGBUILD neko.patch)
Date: Saturday, May 14, 2016 @ 16:06:13
Author: arodseth
Revision: 175383
Use CMake and Ninja
Modified:
neko/trunk/PKGBUILD
Deleted:
neko/trunk/neko.patch
+
PKGBUILD | 44 +++---
neko.patch | 237 ---
2 files changed, 15 insertions(+), 266 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-05-14 13:41:43 UTC (rev 175382)
+++ PKGBUILD2016-05-14 14:06:13 UTC (rev 175383)
@@ -8,45 +8,31 @@
# Contributor: Christian Hesse
pkgname=neko
-pkgver=2.0.0
-pkgrel=8
+pkgver=2.1.0
+pkgrel=1
pkgdesc='High-level dynamically typed programming language'
url='http://nekovm.org/'
license=('LGPL')
arch=('x86_64' 'i686')
-depends=('gc' 'gtk2' 'libmariadbclient' 'sqlite' 'apache')
-makedepends=('pkgconfig' 'apr' 'git')
+depends=('gc' 'gtk2' 'libmariadbclient' 'sqlite' 'apache' 'mbedtls')
+makedepends=('pkgconfig' 'apr' 'git' 'ninja' 'mbedtls' 'cmake')
options=('!strip')
-source=("git://github.com/HaxeFoundation/neko.git#tag=v${pkgver/.0.0/-0}"
-'neko.patch')
-sha256sums=('SKIP'
-'306e70795a59600d30b5bfe448b57686bd6c3df11c7fe6413e0c7c48d83f6431')
+source=("git://github.com/HaxeFoundation/neko#tag=v${pkgver//./-}")
+sha256sums=('SKIP')
-prepare() {
- cd "$pkgname"
-
- patch -p1 -i "$srcdir/neko.patch"
-}
-
build() {
- cd "$pkgname"
-
- [ $CARCH = x86_64 ] && export CFLAGS+=" -D_64BITS"
-
- # The Neko Makefile is a bit broken
- for cmd in clean libneko neko std createbin compiler libs; do
-make "$cmd"
- done
+ mkdir -p build
+ cd build
+ cmake "../$pkgname" \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_INSTALL_LIBDIR=lib \
+-DRUN_LDCONFIG=OFF \
+-GNinja
+ ninja
}
-check() {
- make -C "$pkgname" test
-}
-
package() {
- install -d "$pkgdir/usr/"{bin,lib}
- make -C "$pkgname" INSTALL_PREFIX="$pkgdir/usr" install
- find "$pkgdir/usr/lib" -type f -exec chmod 644 {} \;
+ DESTDIR="$pkgdir" ninja -C build install
}
# getver: nekovm.org/download
Deleted: neko.patch
===
--- neko.patch 2016-05-14 13:41:43 UTC (rev 175382)
+++ neko.patch 2016-05-14 14:06:13 UTC (rev 175383)
@@ -1,237 +0,0 @@
-# Thanks
http://ftp.de.debian.org/debian/pool/main/n/neko/neko_2.0.0-3.debian.tar.gz
-diff --git a/Makefile b/Makefile
-index c6b01b9..835ccbc 100644
a/Makefile
-+++ b/Makefile
-@@ -12,9 +12,9 @@
-
- INSTALL_PREFIX = /usr
-
--CFLAGS = -Wall -O3 -fPIC -fomit-frame-pointer -I vm -D_GNU_SOURCE -I
libs/common
-+CFLAGS += -fPIC -fomit-frame-pointer -I vm -D_GNU_SOURCE -I libs/common
- EXTFLAGS = -pthread
--MAKESO = $(CC) -shared -Wl,-Bsymbolic
-+MAKESO = $(CC) -shared
- LIBNEKO_NAME = libneko.so
- LIBNEKO_LIBS = -ldl -lgc -lm
- NEKOVM_FLAGS = -Lbin -lneko
-@@ -36,7 +36,7 @@ NEKO_EXEC = LD_LIBRARY_PATH=../bin:${LD_LIBRARY_PATH}
NEKOPATH=../boot:../bin ..
- ifeq (${os}, mingw)
- CFLAGS = -g -Wall -O3 -momit-leaf-frame-pointer -I vm -I /usr/local/include
-I libs/common
- EXTFLAGS =
--MAKESO = $(CC) -O -shared
-+MAKESO = $(CC) -shared
- LIBNEKO_NAME = neko.dll
- LIBNEKO_LIBS = -Lbin -lgc
- STD_NDLL_FLAGS = ${NEKOVM_FLAGS} -lws2_32
-@@ -47,7 +47,7 @@ endif
- ifeq (${os}, osx)
- export MACOSX_DEPLOYMENT_TARGET=10.4
- EXTFLAGS =
--MAKESO = ${CC}
-+MAKESO = $(CC) -shared
- LIBNEKO_NAME = libneko.dylib
- LIBNEKO_INSTALL = -install_name @executable_path/${LIBNEKO_NAME}
- LIBNEKO_LIBS = -ldl /opt/local/lib/libgc.a -lm -dynamiclib -single_module
${LIBNEKO_INSTALL}
-@@ -67,7 +67,7 @@ LIBNEKO_OBJECTS = vm/alloc.o vm/builtins.o vm/callback.o
vm/interp.o vm/load.o v
- all: createbin libneko neko std compiler libs
-
- createbin:
-- -mkdir bin 2>/dev/null
-+ mkdir -p bin 2>/dev/null
-
- libneko: bin/${LIBNEKO_NAME}
-
-@@ -101,7 +101,6 @@ bin/${LIBNEKO_NAME}: ${LIBNEKO_OBJECTS}
-
- bin/neko: $(VM_OBJECTS)
- ${CC} ${CFLAGS} ${EXTFLAGS} -o $@ ${VM_OBJECTS} ${NEKOVM_FLAGS}
-- strip bin/neko
-
- bin/std.ndll: ${STD_OBJECTS}
- ${MAKESO} -o $@ ${STD_OBJECTS} ${STD_NDLL_FLAGS}
-@@ -116,9 +115,9 @@ clean:
- install:
- cp bin/${LIBNEKO_NAME} ${INSTALL_PREFIX}/lib
- cp bin/neko bin/nekoc bin/nekotools bin/nekoml bin/nekoml.std
${INSTALL_PREFIX}/bin
-- -mkdir ${INSTALL_PREFIX}/lib/neko
-+ mkdir -p ${INSTALL_PREFIX}/lib/neko
- cp bin/*.ndll ${INSTALL_PREFIX}/lib/neko
-- -mkdir ${INSTALL_PREFIX}/include
-+ mkdir -p ${INSTALL_PREFIX}/include
- cp vm/neko*.h ${INSTALL_PREFIX}/include
-
- uninstall:
-diff --git a/libs/mod_neko/cgi.c b/libs/mod_neko/cgi.c
-index 6830c84..90751ba 100644
a/libs/mod_neko/cgi.c
-+++ b/libs/mod_neko/cgi.c
-@@ -572,9 +572,9 @@ static value log_message( value message ) {
- mcontext *c = CONTEXT();
- val_check(message, string);
- #ifdef APACHE_2_X
-- ap_log_rerror(__FILE__, __LINE__, APLOG_NOTICE, APR_SUCCESS, c->r,
"[mod_neko] %s", val_string(message));
-+
[arch-commits] Commit in neko/trunk (PKGBUILD)
Date: Saturday, March 5, 2016 @ 09:22:30
Author: bpiotrowski
Revision: 164971
OpenSSL 1.0.2g rebuild
Modified:
neko/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-03-05 08:18:02 UTC (rev 164970)
+++ PKGBUILD2016-03-05 08:22:30 UTC (rev 164971)
@@ -9,7 +9,7 @@
pkgname=neko
pkgver=2.0.0
-pkgrel=7
+pkgrel=8
pkgdesc='High-level dynamically typed programming language'
url='http://nekovm.org/'
license=('LGPL')
[arch-commits] Commit in neko/trunk (PKGBUILD)
Date: Sunday, December 20, 2015 @ 16:45:17
Author: arodseth
Revision: 153778
upgpkg: neko 2.0.0-7
Modified:
neko/trunk/PKGBUILD
--+
PKGBUILD | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-12-20 15:21:58 UTC (rev 153777)
+++ PKGBUILD2015-12-20 15:45:17 UTC (rev 153778)
@@ -15,7 +15,7 @@
license=('LGPL')
arch=('x86_64' 'i686')
depends=('gc' 'gtk2' 'libmariadbclient' 'sqlite' 'apache')
-makedepends=('pkgconfig' 'apr')
+makedepends=('pkgconfig' 'apr' 'git')
options=('!strip')
source=("git://github.com/HaxeFoundation/neko.git#tag=v${pkgver/.0.0/-0}"
'neko.patch')
@@ -24,13 +24,19 @@
prepare() {
cd "$pkgname"
+
patch -p1 -i "$srcdir/neko.patch"
}
build() {
+ cd "$pkgname"
+
[ $CARCH = x86_64 ] && export CFLAGS+=" -D_64BITS"
- make -C "$pkgname" clean libneko neko std
- make -C "$pkgname" createbin compiler libs
+
+ # The Neko Makefile is a bit broken
+ for cmd in clean libneko neko std createbin compiler libs; do
+make "$cmd"
+ done
}
check() {
