You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@celix.apache.org by Ferry Huberts <ma...@hupie.com> on 2012/06/22 10:50:41 UTC
[PATCH v1 0/3] Fixes for Fedora 17 x86_64
From: Ferry Huberts <fe...@pelagic.nl>
These are some quick and dirty patches I need to be
able to build on Fedora 17 x86_64.
Disclaimer: I know almost nothing about cmake.
Note: the website instructions on building is missing the dependency on openslp
Ferry Huberts (3):
add build directory and instructions
add -fPIC to remote services
do not statically link system libraries
.gitignore | 4 +---
BUILDING | 6 ++++++
build/.gitignore | 2 ++
remote_services/CMakeLists.txt | 12 ++++++++++++
remote_services/discovery/CMakeLists.txt | 2 +-
remote_services/example_endpoint/CMakeLists.txt | 2 +-
remote_services/example_proxy/CMakeLists.txt | 2 +-
remote_services/remote_service_admin/CMakeLists.txt | 2 +-
8 files changed, 25 insertions(+), 7 deletions(-)
create mode 100644 BUILDING
create mode 100644 build/.gitignore
--
1.7.10.2
[PATCH v1 1/3] add build directory and instructions
Posted by Ferry Huberts <ma...@hupie.com>.
From: Ferry Huberts <fe...@pelagic.nl>
Signed-off-by: Ferry Huberts <fe...@pelagic.nl>
---
.gitignore | 4 +---
BUILDING | 6 ++++++
build/.gitignore | 2 ++
3 files changed, 9 insertions(+), 3 deletions(-)
create mode 100644 BUILDING
create mode 100644 build/.gitignore
diff --git a/.gitignore b/.gitignore
index 85d9ac7..d59b9da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-/build
-
-hessian/build/
\ No newline at end of file
+hessian/build/
diff --git a/BUILDING b/BUILDING
new file mode 100644
index 0000000..1eae33e
--- /dev/null
+++ b/BUILDING
@@ -0,0 +1,6 @@
+To build:
+
+cd build
+cmake ..
+make
+
diff --git a/build/.gitignore b/build/.gitignore
new file mode 100644
index 0000000..a68d087
--- /dev/null
+++ b/build/.gitignore
@@ -0,0 +1,2 @@
+/*
+!/.gitignore
--
1.7.10.2
[PATCH v1 2/3] add -fPIC to remote services
Posted by Ferry Huberts <ma...@hupie.com>.
From: Ferry Huberts <fe...@pelagic.nl>
Signed-off-by: Ferry Huberts <fe...@pelagic.nl>
---
remote_services/CMakeLists.txt | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/remote_services/CMakeLists.txt b/remote_services/CMakeLists.txt
index 03892d9..78b5bde 100644
--- a/remote_services/CMakeLists.txt
+++ b/remote_services/CMakeLists.txt
@@ -15,6 +15,18 @@
# specific language governing permissions and limitations
# under the License.
+# Add -fPIC for x86_64 Unix platforms; this lib will be linked to a shared lib
+if(UNIX AND NOT WIN32)
+ find_program(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin )
+ if(CMAKE_UNAME)
+ exec_program(uname ARGS -m OUTPUT_VARIABLE CMAKE_SYSTEM_PROCESSOR)
+ set(CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR} CACHE INTERNAL "processor type (i386 and x86_64)")
+ if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
+ add_definitions(-fPIC)
+ endif(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
+ endif(CMAKE_UNAME)
+endif(UNIX AND NOT WIN32)
+
#add_subdirectory(mongoose)
add_subdirectory(utils)
--
1.7.10.2
[PATCH v1 3/3] do not statically link system libraries
Posted by Ferry Huberts <ma...@hupie.com>.
From: Ferry Huberts <fe...@pelagic.nl>
Signed-off-by: Ferry Huberts <fe...@pelagic.nl>
---
remote_services/discovery/CMakeLists.txt | 2 +-
remote_services/example_endpoint/CMakeLists.txt | 2 +-
remote_services/example_proxy/CMakeLists.txt | 2 +-
remote_services/remote_service_admin/CMakeLists.txt | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/remote_services/discovery/CMakeLists.txt b/remote_services/discovery/CMakeLists.txt
index 0aa0ccf..5515ad7 100644
--- a/remote_services/discovery/CMakeLists.txt
+++ b/remote_services/discovery/CMakeLists.txt
@@ -27,5 +27,5 @@ bundle(discovery SOURCES
private/src/discovery
private/src/discovery_activator
)
-target_link_libraries(discovery framework ${APRUTIL_LIBRARY} slp.a)
+target_link_libraries(discovery framework ${APRUTIL_LIBRARY} slp.so)
diff --git a/remote_services/example_endpoint/CMakeLists.txt b/remote_services/example_endpoint/CMakeLists.txt
index 985e072..6b6e4a0 100644
--- a/remote_services/example_endpoint/CMakeLists.txt
+++ b/remote_services/example_endpoint/CMakeLists.txt
@@ -26,4 +26,4 @@ bundle(example_endpoint SOURCES
private/src/example_endpoint_activator
private/src/example_endpoint_impl.c
)
-target_link_libraries(example_endpoint framework jansson.a)
+target_link_libraries(example_endpoint framework jansson.so)
diff --git a/remote_services/example_proxy/CMakeLists.txt b/remote_services/example_proxy/CMakeLists.txt
index f677217..1a64a59 100644
--- a/remote_services/example_proxy/CMakeLists.txt
+++ b/remote_services/example_proxy/CMakeLists.txt
@@ -28,4 +28,4 @@ bundle(example_proxy SOURCES
private/src/example_proxy_activator
private/src/example_proxy_impl.c
)
-target_link_libraries(example_proxy framework jansson.a curl.a)
+target_link_libraries(example_proxy framework jansson.so curl.so)
diff --git a/remote_services/remote_service_admin/CMakeLists.txt b/remote_services/remote_service_admin/CMakeLists.txt
index 080b997..83c5fe5 100644
--- a/remote_services/remote_service_admin/CMakeLists.txt
+++ b/remote_services/remote_service_admin/CMakeLists.txt
@@ -30,4 +30,4 @@ bundle(remote_service_admin SOURCES
private/src/remote_service_admin_activator
private/src/mongoose.c
)
-target_link_libraries(remote_service_admin framework ${APRUTIL_LIBRARY} jansson.a)
+target_link_libraries(remote_service_admin framework ${APRUTIL_LIBRARY} jansson.so)
--
1.7.10.2
Re: [PATCH v1 0/3] Fixes for Fedora 17 x86_64
Posted by Alexander Broekhuis <a....@gmail.com>.
Hi Ferry,
Thanks for the patches, I've had to make some small changes (CMake related).
Could you verify if it now works for you?
Thanks again!
---
Author: abroekhuis
Date: Fri Jun 22 13:07:15 2012
New Revision: 1352872
URL: http://svn.apache.org/viewvc?rev=1352872&view=rev
Log:
Fixed building on Linux 64bit systems
Applied patches from Ferry Huberts, fixed some small CMake related issues.
---
2012/6/22 Ferry Huberts <ma...@hupie.com>
> From: Ferry Huberts <fe...@pelagic.nl>
>
> These are some quick and dirty patches I need to be
> able to build on Fedora 17 x86_64.
>
> Disclaimer: I know almost nothing about cmake.
>
> Note: the website instructions on building is missing the dependency on
> openslp
>
> Ferry Huberts (3):
> add build directory and instructions
> add -fPIC to remote services
> do not statically link system libraries
>
> .gitignore | 4 +---
> BUILDING | 6 ++++++
> build/.gitignore | 2 ++
> remote_services/CMakeLists.txt | 12 ++++++++++++
> remote_services/discovery/CMakeLists.txt | 2 +-
> remote_services/example_endpoint/CMakeLists.txt | 2 +-
> remote_services/example_proxy/CMakeLists.txt | 2 +-
> remote_services/remote_service_admin/CMakeLists.txt | 2 +-
> 8 files changed, 25 insertions(+), 7 deletions(-)
> create mode 100644 BUILDING
> create mode 100644 build/.gitignore
>
> --
> 1.7.10.2
>
>
--
Met vriendelijke groet,
Alexander Broekhuis