diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-24 15:37:21 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-24 15:37:21 +0200 |
| commit | da2864ecba8923a3b9c12580662a8a832c5dca5f (patch) | |
| tree | e0014033cf9a4f436f4530dc49aa02f718cbed2b | |
| parent | a002c3aa99b5262668b2f6e76728a48d4515d535 (diff) | |
| parent | ba1dbc96f36abce072ac39a33bb0bd85e12a4e97 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | package/expat/Makefile | 1 | ||||
| -rw-r--r-- | package/ruby/patches/patch-configure.orig | 11 | ||||
| -rw-r--r-- | package/ruby/patches/patch-missing_isinf_c.orig | 11 |
3 files changed, 1 insertions, 22 deletions
diff --git a/package/expat/Makefile b/package/expat/Makefile index c5f676d3d..0ecb2f14c 100644 --- a/package/expat/Makefile +++ b/package/expat/Makefile @@ -11,6 +11,7 @@ PKG_DESCR:= a XML parsing library PKG_SECTION:= libs PKG_URL:= http://expat.sourceforge.net PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=expat/} +PKG_LIBNAME:= libexpat PKG_OPTS:= dev ifeq ($(ADK_STATIC),y) diff --git a/package/ruby/patches/patch-configure.orig b/package/ruby/patches/patch-configure.orig deleted file mode 100644 index 0405e2e91..000000000 --- a/package/ruby/patches/patch-configure.orig +++ /dev/null @@ -1,11 +0,0 @@ ---- ruby-2.0.0-p247.orig/configure 2013-06-27 13:16:17.000000000 +0200 -+++ ruby-2.0.0-p247/configure 2013-10-24 10:36:04.000000000 +0200 -@@ -7372,6 +7372,8 @@ else - unset ac_c_werror_flag - fi - -+# FIXME -+stack_protector=no - - # -fstack-protector - case "$target_os" in #( diff --git a/package/ruby/patches/patch-missing_isinf_c.orig b/package/ruby/patches/patch-missing_isinf_c.orig deleted file mode 100644 index 60b60aead..000000000 --- a/package/ruby/patches/patch-missing_isinf_c.orig +++ /dev/null @@ -1,11 +0,0 @@ ---- ruby-2.0.0-p247.orig/missing/isinf.c 2011-05-15 13:55:52.000000000 +0200 -+++ ruby-2.0.0-p247/missing/isinf.c 2013-10-24 09:03:04.000000000 +0200 -@@ -5,6 +5,8 @@ - #define _IEEE 1 - #include <nan.h> - -+#undef isinf -+ - int - isinf(double n) - { |