- Unbreak the build against Clang

- Update WWW line in port description

Reported by:	miwi
This commit is contained in:
Alexey Dokuchaev 2013-06-10 11:35:00 +00:00
parent be8cec3726
commit 0a72f77185
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=320463
3 changed files with 48 additions and 5 deletions

View file

@ -51,9 +51,16 @@ post-patch:
# Allow it to find definition of `uintmax_t' (required at least for ia64) # Allow it to find definition of `uintmax_t' (required at least for ia64)
@${REINPLACE_CMD} -e 's,<sys/types,<stdint,' \ @${REINPLACE_CMD} -e 's,<sys/types,<stdint,' \
${WRKSRC}/biewlib/sysdep/generic/__config.h ${WRKSRC}/biewlib/sysdep/generic/__config.h
# Fix BTx group of x86 opcodes disasm bug (sf.net bug id 3150304) # Fix BTx group of x86 opcodes disasm bug (upstream ticket #44, closed)
@${REINPLACE_CMD} -e 's,DisP->codelen++),++DisP->codelen),' \ @${REINPLACE_CMD} -e 's,DisP->codelen++),++DisP->codelen),' \
${WRKSRC}/plugins/disasm/ix86/ix86_fun.c ${WRKSRC}/plugins/disasm/ix86/ix86_fun.c
# Fix inline assembly to make Clang happy (ticket #49)
@${REINPLACE_CMD} -e '/srcptr/s,::"g",::"r",' \
${WRKSRC}/biewlib/sysdep/ia32/aclib_template.c \
${WRKSRC}/biewlib/sysdep/x86_64/aclib_template.c
@${REINPLACE_CMD} -E 's,fild|fistp,&s,' \
${WRKSRC}/biewlib/sysdep/ia32/cpu_info.c \
${WRKSRC}/biewlib/sysdep/x86_64/cpu_info.c
post-build: post-build:
# Convert Russian text files to UTF-8 encoding (doing it in post-build # Convert Russian text files to UTF-8 encoding (doing it in post-build

View file

@ -1,6 +1,42 @@
--- configure.orig --- configure.orig
+++ configure +++ configure
@@ -583,10 +583,10 @@ @@ -100,7 +100,7 @@
# Use this before starting a check
echocheck() {
echo "============ Checking for $@ ============" >> "$TMPLOG"
- echo ${_echo_n} "Checking for $@ ... ${_echo_c}"
+ echo ${_echo_n} "Checking for $@... ${_echo_c}"
}
# Use this to echo the results of a check
@@ -493,20 +493,21 @@
echores "$_target_system"
-echo "Detected host..."$system_name
+echo "Detected host..." $system_name
_cdefos="-DDATADIR='\"$_datadir\"'"
-cc_name=`$_cc -v 2>&1 | tail -n 1 | cut -d ' ' -f 1`
-cc_version=`$_cc -dumpversion`
+eval `$_cc -v 2>&1 | sed -En \
+ '/version/s,(FreeBSD )?(.*) version ([0-9.]*).*,\2 \3,p' | (read cc_name \
+ cc_version ; echo cc_name=$cc_name \; cc_version=$cc_version)`
echocheck "C compiler name"
echores $cc_name
case $cc_name in
- gcc)
+ gcc|clang)
;;
*)
- die "Unknown compiler name $cc_name. Project required GCC"
+ die "Unknown compiler name $cc_name. Project requires GCC or Clang"
;;
esac
@@ -583,10 +584,10 @@
_osldef="$_debug $_profile $_osldef" _osldef="$_debug $_profile $_osldef"
elif test -z "$CFLAGS" ; then elif test -z "$CFLAGS" ; then
_cdefos="-DNDEBUG=1 -O2 -ffast-math -fomit-frame-pointer $_cdefos" _cdefos="-DNDEBUG=1 -O2 -ffast-math -fomit-frame-pointer $_cdefos"
@ -12,7 +48,7 @@
test -n "$LDFLAGS" && _osldef="$LDFLAGS $_osldef" test -n "$LDFLAGS" && _osldef="$LDFLAGS $_osldef"
test -n "$LIBS" && _osldef="$LIBS $_osldef" test -n "$LIBS" && _osldef="$LIBS $_osldef"
@@ -656,10 +656,10 @@ @@ -656,10 +657,10 @@
echocheck "slang.h" echocheck "slang.h"
check_header slang.h check_header slang.h
enabled slang_h && _cdefos="-D_SLANG_ -D__OS_NAME__='\"Unix/Slang\"' $_cdefos" enabled slang_h && _cdefos="-D_SLANG_ -D__OS_NAME__='\"Unix/Slang\"' $_cdefos"
@ -25,7 +61,7 @@
echocheck "curses.h" echocheck "curses.h"
cat > $TMPC << EOF cat > $TMPC << EOF
#include <curses.h> #include <curses.h>
@@ -678,8 +678,10 @@ @@ -678,8 +679,10 @@
fi fi
echores "$_curses" echores "$_curses"
fi fi

View file

@ -5,4 +5,4 @@ for AVR/Java/x86-AMD64/ARM-XScale/PPC-64 code, Russian codepage converter,
full preview of formats MZ, NE, PE, NLM, COFF32, ELF (and partially a.out, full preview of formats MZ, NE, PE, NLM, COFF32, ELF (and partially a.out,
LE, LX, PharLap), code navigator, and much more. LE, LX, PharLap), code navigator, and much more.
WWW: http://biew.sourceforge.net/ WWW: http://beye.sourceforge.net/