generic-library/libreSSL
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of cvs.openbsd.org:/cvs.b/libressl/portable

Browse Source
This commit is contained in:
Bob Beck 2014-07-11 10:16:40 -06:00
commit 531318957a
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am.common
View File

@ -1,2 +1,4 @@
AM_CPPFLAGS = -I$(top_srcdir)/include AM_CPPFLAGS = -I$(top_srcdir)/include
AM_CPPFLAGS += -DOPENSSL_NO_ASM AM_CPPFLAGS += -DOPENSSL_NO_ASM
AM_CPPFLAGS += -DHAVE_CRYPTODEV
AM_CPPFLAGS += -DLIBRESSL_INTERNAL

3
configure.ac
View File

@ -6,7 +6,7 @@ AC_CONFIG_MACRO_DIR([m4])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_SUBST([USER_CFLAGS], "-O2 $CFLAGS") AC_SUBST([USER_CFLAGS], "-O2 $CFLAGS")
CFLAGS="$CFLAGS -Wall -Werror -std=c99 -g -Wno-pointer-sign -DHAVE_CRYPTODEV -DLIBRESSL_INTERNAL" CFLAGS="$CFLAGS -Wall -Werror -std=c99 -g -Wno-pointer-sign"
case $target_os in case $target_os in
*darwin*) *darwin*)
@ -36,7 +36,6 @@ AC_PROG_CC
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
AC_PROG_CC_STDC AC_PROG_CC_STDC
AM_PROG_CC_C_O AM_PROG_CC_C_O
AC_PROG_LN_S
AC_CHECK_FUNC(strlcpy,[AC_SEARCH_LIBS(strlcpy,, [NO_STRLCPY=], AC_CHECK_FUNC(strlcpy,[AC_SEARCH_LIBS(strlcpy,, [NO_STRLCPY=],
[NO_STRLCPY=yes])], [NO_STRLCPY=yes]) [NO_STRLCPY=yes])], [NO_STRLCPY=yes])

2
update.sh
View File

@ -413,6 +413,6 @@ crypto_excludes=(
source links source links
for i in $MLINKS; do for i in $MLINKS; do
IFS=","; set $i; unset IFS IFS=","; set $i; unset IFS
echo " \$(LN_S) -f \$(DESTDIR)\$(mandir)/man3/$1 \$(DESTDIR)\$(mandir)/man3/$2" >> Makefile.am echo " ln -f \$(DESTDIR)\$(mandir)/man3/$1 \$(DESTDIR)\$(mandir)/man3/$2" >> Makefile.am
done done
) )