Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix build on macosx.
* dynamic libraries were not actually generated due to wrong compilation option
  (linker option -dylib passed instead of compiler -shared one).
  • Loading branch information
ktf committed Apr 15, 2011
1 parent 69a033c commit 35985e1
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 0 deletions.
15 changes: 15 additions & 0 deletions dpm-1.8.0-shlib-macosx.patch
@@ -0,0 +1,15 @@
diff --git a/LCG-DM-1.8.0/config/darwin.cf b/LCG-DM-1.8.0/config/darwin.cf
index ab0bf06..8cf4e0b 100644
--- a/LCG-DM-1.8.0/config/darwin.cf
+++ b/LCG-DM-1.8.0/config/darwin.cf
@@ -12,8 +12,8 @@ GSOAP_PLATFORM = macosx
MTCCFLAGS = -DCTHREAD_POSIX -D_THREAD_SAFE -D_REENTRANT
MTLDLIBS =
MTLDFLAGS =
-SHLIBLDFLAGS = -undefined dynamic_lookup -dylib -single_module
-SHLIBREQLIBS = -lc /usr/lib/dylib1.o
+SHLIBLDFLAGS = -undefined dynamic_lookup -shared
+SHLIBREQLIBS = -lc
FC = gfortran

#include <darwin.rules>
2 changes: 2 additions & 0 deletions dpm.spec
Expand Up @@ -10,6 +10,7 @@ Source: http://eticssoft.web.cern.ch/eticssoft/repository/org.glite/LCG-DM/%{bas
# Source: http://cmsrep.cern.ch/cms/cpt/Software/download/cms.ap/SOURCES/%{cmsplatf}/external/dpm/%{downloadv}/DPM-%{downloadv}.src.rpm
Patch0: dpm-1.7.4.7-ld
Patch1: dpm-1.7.4.7-macosx
Patch2: dpm-1.8.0-shlib-macosx

%define cpu %(echo %cmsplatf | cut -d_ -f2)
%if "%cpu" != "amd64"
Expand All @@ -31,6 +32,7 @@ cd LCG-DM-%{baseVersion}
case %cmsos in
osx*)
%patch1 -p2
%patch2 -p2
;;
esac

Expand Down

0 comments on commit 35985e1

Please sign in to comment.