charon-xpc: Don’t build against libvstr anymore

We now have our own printf backend and use it instead of Vstr.

diff --git a/src/frontends/osx/README.md b/src/frontends/osx/README.md
index 767b51b..e535753 100644 (file)
--- a/src/frontends/osx/README.md
+++ b/src/frontends/osx/README.md
@@ -22,15 +22,11 @@ the charon-xpc tarball with:
 
 ## Building strongSwan ##
 
-strongSwan on OS X requires the libvstr library. The simplest way to install
-it is using MacPorts. It gets statically linked to charon-xpc, hence it is not
-needed to run the built App.
-
 Before building the Xcode project, the strongSwan base tree must be built using
 a monolithic and static build. This can be achieved on OS X by using:
 
-    LDFLAGS="-all_load -L/opt/local/lib" \
-    CFLAGS="-idirafter /opt/local/include -O2 -Wall -Wno-format -Wno-pointer-sign" \
+    LDFLAGS="-all_load" \
+    CFLAGS="-O2 -Wall -Wno-format -Wno-pointer-sign" \
     ./configure --enable-monolithic --disable-shared --enable-static \
         --disable-defaults \
         --enable-openssl --enable-kernel-libipsec --enable-kernel-pfroute \

diff --git a/src/frontends/osx/strongSwan.xcodeproj/project.pbxproj b/src/frontends/osx/strongSwan.xcodeproj/project.pbxproj
index 61f6329..3b77d25 100644 (file)
--- a/src/frontends/osx/strongSwan.xcodeproj/project.pbxproj
+++ b/src/frontends/osx/strongSwan.xcodeproj/project.pbxproj
@@ -209,12 +209,12 @@
                                CODE_SIGN_IDENTITY = "Joe Developer";
                                GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
                                GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
+                               GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
                                HEADER_SEARCH_PATHS = (
                                        /usr/include,
                                        ../../libstrongswan,
                                        ../../libcharon,
                                        ../../libhydra,
-                                       /opt/local/include,
                                );
                                INFOPLIST_FILE = "charon-xpc/charon-xpc-Info.plist";
                                INSTALL_PATH = /;
@@ -223,16 +223,13 @@
                                        ../../libstrongswan/.libs,
                                        ../../libcharon/.libs,
                                        ../../libhydra/.libs,
-                                       /opt/local/lib,
                                );
                                OTHER_CFLAGS = (
                                        "-include",
                                        ../../../config.h,
-                                       "-DVSTR_COMPILE_INLINE=0",
                                );
                                OTHER_LDFLAGS = (
                                        "-lcrypto",
-                                       /opt/local/lib/libvstr.a,
                                        "-force_load",
                                        ../../libstrongswan/.libs/libstrongswan.a,
                                        "-force_load",
@@ -263,12 +260,12 @@
                                COPY_PHASE_STRIP = YES;
                                GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
                                GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
+                               GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
                                HEADER_SEARCH_PATHS = (
                                        /usr/include,
                                        ../../libstrongswan,
                                        ../../libcharon,
                                        ../../libhydra,
-                                       /opt/local/include,
                                );
                                INFOPLIST_FILE = "charon-xpc/charon-xpc-Info.plist";
                                INSTALL_PATH = /;
@@ -277,16 +274,13 @@
                                        ../../libstrongswan/.libs,
                                        ../../libcharon/.libs,
                                        ../../libhydra/.libs,
-                                       /opt/local/lib,
                                );
                                OTHER_CFLAGS = (
                                        "-include",
                                        ../../../config.h,
-                                       "-DVSTR_COMPILE_INLINE=0",
                                );
                                OTHER_LDFLAGS = (
                                        "-lcrypto",
-                                       /opt/local/lib/libvstr.a,
                                        "-force_load",
                                        ../../libstrongswan/.libs/libstrongswan.a,
                                        "-force_load",