On 2013-05-15 09.11, David Aguilar wrote:
> Mac OS X 10.8 Mountain Lion prints warnings when building git:
>
> warning: 'SHA1_Init' is deprecated
> (declared at /usr/include/openssl/sha.h:121)
>
> Silence the warnings by using the CommonCrytpo SHA-1
> functions for SHA1_Init(), SHA1_Update(), and SHA1_Final().
>
> COMMON_DIGEST_FOR_OPENSSL is defined to enable the OpenSSL
> compatibility macros in CommonDigest.h.
>
> Add a NO_APPLE_COMMON_CRYPTO option to the Makefile to allow
> users to opt out of using this library. When defined, Git will
> use OpenSSL instead.
>
> Helped-by: Eric Sunshine <[email protected]>
> Signed-off-by: David Aguilar <[email protected]>
> ---
> Both of these are replacement patches "pu".
>
> Changes from last time:
>
> It now uses a single APPLE_COMMON_CRYPTO definition.
> Users can now opt-out by setting NO_APPLE_COMMON_CRYPTO.
>
> Makefile | 13 +++++++++++++
> 1 file changed, 13 insertions(+)
>
> diff --git a/Makefile b/Makefile
> index f698c1a..8309c41 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -137,6 +137,10 @@ all::
> # specify your own (or DarwinPort's) include directories and
> # library directories by defining CFLAGS and LDFLAGS appropriately.
> #
> +# Define NO_APPLE_COMMON_CRYPTO if you are building on Darwin/Mac OS X
> +# and do not want to use Apple's CommonCrypto library. This allows you
> +# to provide your own OpenSSL library, for example from MacPorts.
> +#
> # Define BLK_SHA1 environment variable to make use of the bundled
> # optimized C SHA1 routine.
> #
> @@ -1054,6 +1058,9 @@ ifeq ($(uname_S),Darwin)
> BASIC_LDFLAGS += -L/opt/local/lib
> endif
> endif
> + ifndef NO_APPLE_COMMON_CRYPTO
> + APPLE_COMMON_CRYPTO = YesPlease
> + endif
> NO_REGEX = YesPlease
> PTHREAD_LIBS =
> endif
> @@ -1389,10 +1396,16 @@ ifdef PPC_SHA1
> LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o
> LIB_H += ppc/sha1.h
> else
> +ifdef APPLE_COMMON_CRYPTO
> + BASIC_CFLAGS += -DCOMMON_DIGEST_FOR_OPENSSL
> + SHA1_HEADER = <CommonCrypto/CommonDigest.h>
Would it make sense to replace APPLE_COMMON_CRYPTO
with COMMON_DIGEST_FOR_OPENSSL ?
In the spirit of other Makefile-defines becoming Compiler defines,
a random picked example:
ifdef NO_STRTOULL
COMPAT_CFLAGS += -DNO_STRTOULL
endif
/Torsten
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
