You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by pn...@apache.org on 2017/01/12 11:52:01 UTC
[1/2] celix git commit: CELIX-387: Updates zlib download url to
1.2.10, the previous used version is no longer available.
Repository: celix
Updated Branches:
refs/heads/develop e04bb451a -> 2de5fb464
CELIX-387: Updates zlib download url to 1.2.10, the previous used version is no longer available.
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/4c68a18a
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/4c68a18a
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/4c68a18a
Branch: refs/heads/develop
Commit: 4c68a18a0e977c50d254c18862ed9e5048b914c1
Parents: e04bb45
Author: Pepijn Noltes <pe...@gmail.com>
Authored: Thu Jan 12 12:51:06 2017 +0100
Committer: Pepijn Noltes <pe...@gmail.com>
Committed: Thu Jan 12 12:51:06 2017 +0100
----------------------------------------------------------------------
Dockerfile.Android | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/4c68a18a/Dockerfile.Android
----------------------------------------------------------------------
diff --git a/Dockerfile.Android b/Dockerfile.Android
index 879ee9e..dc12367 100644
--- a/Dockerfile.Android
+++ b/Dockerfile.Android
@@ -87,9 +87,9 @@ RUN curl -L -O http://downloads.sourceforge.net/libuuid/libuuid-1.0.3.tar.gz &&
# zlib
-RUN curl -L -O http://zlib.net/zlib-1.2.8.tar.gz && \
- tar -xvzf zlib-1.2.8.tar.gz && \
- cd zlib-1.2.8 && \
+RUN curl -L -O http://zlib.net/zlib-1.2.10.tar.gz &&
+ tar -xvzf zlib-*.tar.gz && \
+ cd zlib-* && \
./configure --prefix=/build/output/zlib && make && make install
# curl
[2/2] celix git commit: CELIX-387: Updating travis to use xcode 8.2.
Posted by pn...@apache.org.
CELIX-387: Updating travis to use xcode 8.2.
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/2de5fb46
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/2de5fb46
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/2de5fb46
Branch: refs/heads/develop
Commit: 2de5fb4647e1319ec6d4446ab86996e6e11d19c7
Parents: 4c68a18
Author: Pepijn Noltes <pe...@gmail.com>
Authored: Thu Jan 12 12:56:50 2017 +0100
Committer: Pepijn Noltes <pe...@gmail.com>
Committed: Thu Jan 12 12:56:50 2017 +0100
----------------------------------------------------------------------
.travis.yml | 1 +
framework/private/src/bundle_archive.c | 8 --------
2 files changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/2de5fb46/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 66564e3..3d988bf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
sudo: required
dist: trusty
+osx_image: xcode8.2
language: c
http://git-wip-us.apache.org/repos/asf/celix/blob/2de5fb46/framework/private/src/bundle_archive.c
----------------------------------------------------------------------
diff --git a/framework/private/src/bundle_archive.c b/framework/private/src/bundle_archive.c
index 889fd4b..3d0513d 100644
--- a/framework/private/src/bundle_archive.c
+++ b/framework/private/src/bundle_archive.c
@@ -28,15 +28,7 @@
#include <string.h>
#include <time.h>
#include <sys/stat.h>
-
-#ifdef __APPLE__
-//FIXME: compiling using travix and max osx is giving compile error for unknown type name '__darwin_pthread_mutex_t'
-//including pthread.h to remove compile error
-#include <pthread.h>
-#endif
-
#include <dirent.h>
-#include <string.h>
#include <unistd.h>
#include "bundle_archive.h"