libresolv-57.tar.gz

diff --git a/libresolv.xcodeproj/project.pbxproj b/libresolv.xcodeproj/project.pbxproj
index 7a1df2b6c2264ac981d95d79e3ee904e7dd68ae7..096ccb2ebd899f9250063a24f74f2d8500615eb9 100644 (file)
--- a/libresolv.xcodeproj/project.pbxproj
+++ b/libresolv.xcodeproj/project.pbxproj
@@ -47,6 +47,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+               81BED2FE185D91FC00BC7221 /* libresolv.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = libresolv.xcconfig; path = xcodescripts/libresolv.xcconfig; sourceTree = "<group>"; };
                FC585ED614EDAEA400C8F63A /* libresolv.9.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libresolv.9.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
                FC585EE014EDAF3000C8F63A /* base64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = base64.c; sourceTree = "<group>"; };
                FC585EE114EDAF3000C8F63A /* dns_async.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dns_async.c; sourceTree = "<group>"; };
@@ -103,6 +104,7 @@
                FC585ECB14EDAEA400C8F63A = {
                        isa = PBXGroup;
                        children = (
+                               81BED2FE185D91FC00BC7221 /* libresolv.xcconfig */,
                                FC585EE014EDAF3000C8F63A /* base64.c */,
                                FC585EE114EDAF3000C8F63A /* dns_async.c */,
                                FC585EE214EDAF3000C8F63A /* dns_private.h */,
@@ -280,37 +282,13 @@
                FC585ED914EDAEA400C8F63A /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               CODE_SIGN_IDENTITY = "-";
-                               COPY_PHASE_STRIP = YES;
-                               DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-                               "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*]" = USE_DNS_PSELECT;
-                               GCC_TREAT_WARNINGS_AS_ERRORS = NO;
-                               GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES;
-                               GCC_WARN_UNINITIALIZED_AUTOS = YES;
-                               GCC_WARN_UNUSED_VARIABLE = YES;
-                               INSTALLHDRS_SCRIPT_PHASE = YES;
-                               INSTALL_PATH = /usr/lib;
-                               "INSTALL_PATH[sdk=iphonesimulator*]" = "$(SDKROOT)/usr/lib";
-                               OTHER_CFLAGS = "-fno-common";
-                               PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include;
-                               "PRIVATE_HEADERS_FOLDER_PATH[sdk=iphonesimulator*]" = "$(SDKROOT)/usr/local/include";
-                               PROVISIONING_PROFILE = "";
-                               PUBLIC_HEADERS_FOLDER_PATH = /usr/include;
-                               "PUBLIC_HEADERS_FOLDER_PATH[sdk=iphonesimulator*]" = "$(SDKROOT)/usr/include";
-                               WARNING_CFLAGS = "-Wall";
                        };
                        name = Release;
                };
                FC585EDC14EDAEA400C8F63A /* Release */ = {
                        isa = XCBuildConfiguration;
+                       baseConfigurationReference = 81BED2FE185D91FC00BC7221 /* libresolv.xcconfig */;
                        buildSettings = {
-                               FRAMEWORK_VERSION = 9;
-                               PRODUCT_NAME = "$(TARGET_NAME).$(FRAMEWORK_VERSION)";
-                               LD_DYLIB_INSTALL_NAME = "/usr/lib/$(PRODUCT_NAME).dylib";
                        };
                        name = Release;
                };

diff --git a/nameser.h b/nameser.h
index 978ba5c17a8b2176499baad6fc4388169b587fe5..75a220d835a7b0d9c24bf5480cf9eaaa908aff9b 100644 (file)
--- a/nameser.h
+++ b/nameser.h
@@ -453,7 +453,7 @@ typedef enum __ns_cert_types {
  * Inline versions of get/put short/long.  Pointer is advanced.
  */
 #define NS_GET16(s, cp) do { \
-       register const u_char *t_cp = (const u_char *)(cp); \
+       const u_char *t_cp = (const u_char *)(cp); \
        (s) = ((u_int16_t)t_cp[0] << 8) \
            | ((u_int16_t)t_cp[1]) \
            ; \
@@ -461,7 +461,7 @@ typedef enum __ns_cert_types {
 } while (0)
 
 #define NS_GET32(l, cp) do { \
-       register const u_char *t_cp = (const u_char *)(cp); \
+       const u_char *t_cp = (const u_char *)(cp); \
        (l) = ((u_int32_t)t_cp[0] << 24) \
            | ((u_int32_t)t_cp[1] << 16) \
            | ((u_int32_t)t_cp[2] << 8) \
@@ -471,16 +471,16 @@ typedef enum __ns_cert_types {
 } while (0)
 
 #define NS_PUT16(s, cp) do { \
-       register u_int16_t t_s = (u_int16_t)(s); \
-       register u_char *t_cp = (u_char *)(cp); \
+       u_int16_t t_s = (u_int16_t)(s); \
+       u_char *t_cp = (u_char *)(cp); \
        *t_cp++ = t_s >> 8; \
        *t_cp   = t_s; \
        (cp) += NS_INT16SZ; \
 } while (0)
 
 #define NS_PUT32(l, cp) do { \
-       register u_int32_t t_l = (u_int32_t)(l); \
-       register u_char *t_cp = (u_char *)(cp); \
+       u_int32_t t_l = (u_int32_t)(l); \
+       u_char *t_cp = (u_char *)(cp); \
        *t_cp++ = t_l >> 24; \
        *t_cp++ = t_l >> 16; \
        *t_cp++ = t_l >> 8; \

diff --git a/xcodescripts/headers.sh b/xcodescripts/headers.sh
index 1f35dbcdbae9cce89e0157b6216d95013a8b83bf..3021aae60fc6bc909cabb897a87b769eb5eb7905 100644 (file)
--- a/xcodescripts/headers.sh
+++ b/xcodescripts/headers.sh
@@ -1,11 +1,7 @@
 #!/bin/bash
 set -e -x
 
-# check if we're building for the simulator
-if [ "${RC_ProjectName%_Sim}" != "${RC_ProjectName}" ] ; then
-       DSTROOT="${DSTROOT}${SDKROOT}"
-fi
-
+DSTROOT="$DSTROOT$INSTALL_PATH_PREFIX"
 DIR="$DSTROOT"/usr/include/arpa
 install -d -m 0755 -o "$INSTALL_OWNER" -g "$INSTALL_GROUP" \
        "$DIR"

diff --git a/xcodescripts/libresolv.xcconfig b/xcodescripts/libresolv.xcconfig
new file mode 100644 (file)
index 0000000..c34fec3
--- /dev/null
+++ b/xcodescripts/libresolv.xcconfig
@@ -0,0 +1,25 @@
+#include "<DEVELOPER_DIR>/Makefiles/CoreOS/Xcode/BSD.xcconfig"
+#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/SimulatorSupport.xcconfig"
+
+PRODUCT_NAME = $(TARGET_NAME).$(FRAMEWORK_VERSION)
+DEBUG_INFORMATION_FORMAT = dwarf-with-dsym
+CODE_SIGN_IDENTITY = -
+PROVISIONING_PROFILE =
+INSTALL_PATH_ACTUAL = /usr/lib
+INSTALL_PATH[sdk=macosx*] = $(INSTALL_PATH_ACTUAL)
+COPY_PHASE_STRIP = YES
+FRAMEWORK_VERSION = 9
+PRIVATE_HEADERS_FOLDER_PATH = $(INSTALL_PATH_PREFIX)/usr/local/include
+PUBLIC_HEADERS_FOLDER_PATH = $(INSTALL_PATH_PREFIX)/usr/include
+ALWAYS_SEARCH_USER_PATHS = NO
+OTHER_CFLAGS = -fno-common
+WARNING_CFLAGS = -Wall
+GCC_C_LANGUAGE_STANDARD = gnu99
+GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = USE_DNS_PSELECT
+GCC_TREAT_WARNINGS_AS_ERRORS = NO
+GCC_WARN_64_TO_32_BIT_CONVERSION = YES
+GCC_WARN_ABOUT_RETURN_TYPE = YES
+GCC_WARN_UNINITIALIZED_AUTOS = YES
+GCC_WARN_UNUSED_VARIABLE = YES
+GCC_ENABLE_OBJC_EXCEPTIONS = YES
+INSTALLHDRS_SCRIPT_PHASE = YES

diff --git a/xcodescripts/links.sh b/xcodescripts/links.sh
index 82266be57c728b80e21ed329ada422f1462191da..926a23136d3bd2b9caa4884f580c0ca53e72c01e 100644 (file)
--- a/xcodescripts/links.sh
+++ b/xcodescripts/links.sh
@@ -3,10 +3,7 @@ set -e -x
 
 if [ "$ACTION" = installhdrs ]; then exit 0; fi
 
-# check if we're building for the simulator
-if [ "${RC_ProjectName%_Sim}" != "${RC_ProjectName}" ] ; then
-       DSTROOT="${DSTROOT}${SDKROOT}"
-fi
+DSTROOT="$DSTROOT$INSTALL_PATH_PREFIX"
 
 LIBDIR="$DSTROOT"/usr/lib
 ln -s libresolv.9.dylib "$LIBDIR"/libresolv.dylib

diff --git a/xcodescripts/manpages.sh b/xcodescripts/manpages.sh
index 36b3bf07687bf7621b432abbdd62ef3956ad1bb7..4f3ed9ca3ecdfc55cd8e0f07e87608264d376fdb 100644 (file)
--- a/xcodescripts/manpages.sh
+++ b/xcodescripts/manpages.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 set -e -x
 
+# don't install man pages for installhdrs or iOS builds
 if [ "$ACTION" = installhdrs ]; then exit 0; fi
-if [ "$PLATFORM_NAME" = iphoneos ]; then exit 0; fi
-if [ "$PLATFORM_NAME" = iphonesimulator ]; then exit 0; fi
+if [ "${PLATFORM_NAME/iphone/}" != "${PLATFORM_NAME}" ]; then exit 0; fi
 
 MANDIR="$DSTROOT"/usr/share/man