charon-xpc: Don’t build against libvstr anymore
We now have our own printf backend and use it instead of Vstr.
This commit is contained in:
@@ -22,15 +22,11 @@ the charon-xpc tarball with:
|
|||||||
|
|
||||||
## Building strongSwan ##
|
## 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
|
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:
|
a monolithic and static build. This can be achieved on OS X by using:
|
||||||
|
|
||||||
LDFLAGS="-all_load -L/opt/local/lib" \
|
LDFLAGS="-all_load" \
|
||||||
CFLAGS="-idirafter /opt/local/include -O2 -Wall -Wno-format -Wno-pointer-sign" \
|
CFLAGS="-O2 -Wall -Wno-format -Wno-pointer-sign" \
|
||||||
./configure --enable-monolithic --disable-shared --enable-static \
|
./configure --enable-monolithic --disable-shared --enable-static \
|
||||||
--disable-defaults \
|
--disable-defaults \
|
||||||
--enable-openssl --enable-kernel-libipsec --enable-kernel-pfroute \
|
--enable-openssl --enable-kernel-libipsec --enable-kernel-pfroute \
|
||||||
|
|||||||
@@ -209,12 +209,12 @@
|
|||||||
CODE_SIGN_IDENTITY = "Joe Developer";
|
CODE_SIGN_IDENTITY = "Joe Developer";
|
||||||
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
|
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
|
||||||
GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
|
GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
|
||||||
|
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
|
||||||
HEADER_SEARCH_PATHS = (
|
HEADER_SEARCH_PATHS = (
|
||||||
/usr/include,
|
/usr/include,
|
||||||
../../libstrongswan,
|
../../libstrongswan,
|
||||||
../../libcharon,
|
../../libcharon,
|
||||||
../../libhydra,
|
../../libhydra,
|
||||||
/opt/local/include,
|
|
||||||
);
|
);
|
||||||
INFOPLIST_FILE = "charon-xpc/charon-xpc-Info.plist";
|
INFOPLIST_FILE = "charon-xpc/charon-xpc-Info.plist";
|
||||||
INSTALL_PATH = /;
|
INSTALL_PATH = /;
|
||||||
@@ -223,16 +223,13 @@
|
|||||||
../../libstrongswan/.libs,
|
../../libstrongswan/.libs,
|
||||||
../../libcharon/.libs,
|
../../libcharon/.libs,
|
||||||
../../libhydra/.libs,
|
../../libhydra/.libs,
|
||||||
/opt/local/lib,
|
|
||||||
);
|
);
|
||||||
OTHER_CFLAGS = (
|
OTHER_CFLAGS = (
|
||||||
"-include",
|
"-include",
|
||||||
../../../config.h,
|
../../../config.h,
|
||||||
"-DVSTR_COMPILE_INLINE=0",
|
|
||||||
);
|
);
|
||||||
OTHER_LDFLAGS = (
|
OTHER_LDFLAGS = (
|
||||||
"-lcrypto",
|
"-lcrypto",
|
||||||
/opt/local/lib/libvstr.a,
|
|
||||||
"-force_load",
|
"-force_load",
|
||||||
../../libstrongswan/.libs/libstrongswan.a,
|
../../libstrongswan/.libs/libstrongswan.a,
|
||||||
"-force_load",
|
"-force_load",
|
||||||
@@ -263,12 +260,12 @@
|
|||||||
COPY_PHASE_STRIP = YES;
|
COPY_PHASE_STRIP = YES;
|
||||||
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
|
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
|
||||||
GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
|
GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
|
||||||
|
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
|
||||||
HEADER_SEARCH_PATHS = (
|
HEADER_SEARCH_PATHS = (
|
||||||
/usr/include,
|
/usr/include,
|
||||||
../../libstrongswan,
|
../../libstrongswan,
|
||||||
../../libcharon,
|
../../libcharon,
|
||||||
../../libhydra,
|
../../libhydra,
|
||||||
/opt/local/include,
|
|
||||||
);
|
);
|
||||||
INFOPLIST_FILE = "charon-xpc/charon-xpc-Info.plist";
|
INFOPLIST_FILE = "charon-xpc/charon-xpc-Info.plist";
|
||||||
INSTALL_PATH = /;
|
INSTALL_PATH = /;
|
||||||
@@ -277,16 +274,13 @@
|
|||||||
../../libstrongswan/.libs,
|
../../libstrongswan/.libs,
|
||||||
../../libcharon/.libs,
|
../../libcharon/.libs,
|
||||||
../../libhydra/.libs,
|
../../libhydra/.libs,
|
||||||
/opt/local/lib,
|
|
||||||
);
|
);
|
||||||
OTHER_CFLAGS = (
|
OTHER_CFLAGS = (
|
||||||
"-include",
|
"-include",
|
||||||
../../../config.h,
|
../../../config.h,
|
||||||
"-DVSTR_COMPILE_INLINE=0",
|
|
||||||
);
|
);
|
||||||
OTHER_LDFLAGS = (
|
OTHER_LDFLAGS = (
|
||||||
"-lcrypto",
|
"-lcrypto",
|
||||||
/opt/local/lib/libvstr.a,
|
|
||||||
"-force_load",
|
"-force_load",
|
||||||
../../libstrongswan/.libs/libstrongswan.a,
|
../../libstrongswan/.libs/libstrongswan.a,
|
||||||
"-force_load",
|
"-force_load",
|
||||||
|
|||||||
Reference in New Issue
Block a user