gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-22 22:00:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:gnustep/tools-make into android_check

Browse source
This commit is contained in:
Gregory Casamento 2020-08-07 02:48:34 -04:00
commit 62c53b7f83
7 changed files with 33 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CODEOWNERS Normal file
View file

@ -0,0 +1,5 @@
# These owners will be the default owners for everything in
# the repo. Unless a later match takes precedence,
# @global-owner1 and @global-owner2 will be requested for
# review when someone opens a pull request.
* @rfm

17
ChangeLog
View file

@ -1,3 +1,20 @@
2020-07-09 Wolfgang Lux <wolfgang.lux@gmail.com>
* rules.make: Fix variable name to make compiling for ARC actually
work.
2020-06-07 Fred Kiefer <FredKiefer@gmx.de>
* gs_gcc_version.m4: Add -dumpfullversion to the version
extraction. Versions of gcc > 7.0 require this parameter to output
the full version number. Older versions should just ignore this option.
* configure: Regenerate
2020-04-14 Yavor Doganov <yavor@gnu.org>
* config-precomp-test/run-test.sh: Put $LIBS at the end so that it
works with GCC >= 9 (which implies -Wl,--as-needed).
2020-04-13 Ivan Vucica <ivan@vucica.net>
* Documentation/announce.texi:

3
TestFramework/Testing.h
View file

@ -564,7 +564,8 @@ static void testStart()
/* some good macros to compare floating point numbers */
#import <math.h>
#import <float.h>
#define EQ(x, y) (fabs((x) - (y)) <= fabs((x) + (y)) * (FLT_EPSILON * 100))
#define EQ(x, y) \
(((x) >= ((y) - FLT_EPSILON*100)) && ((x) <= ((y) + FLT_EPSILON*100)))
#define LE(x, y) ((x)<(y) || EQ(x, y))
#define GE(x, y) ((y)<(x) || EQ(x, y))
#define LT(x, y) (!GE(x, y))

8
config-precomp-test/run-test.sh
View file

@ -77,8 +77,8 @@ fi
# Try to compile the file first.
echo "** Compile the file without precompiled headers" >>"$gs_logfile" 2>&1
echo "$CC -o \"$gs_builddir/config-precomp-test.out\" $CFLAGS $CPPFLAGS $LDFLAGS $LIBS config-precomp-test.m" >>"$gs_logfile" 2>&1
$CC -o "$gs_builddir/config-precomp-test.out" $CFLAGS $CPPFLAGS $LDFLAGS $LIBS config-precomp-test.m >>"$gs_logfile" 2>&1
echo "$CC -o \"$gs_builddir/config-precomp-test.out\" $CFLAGS $CPPFLAGS $LDFLAGS config-precomp-test.m $LIBS" >>"$gs_logfile" 2>&1
$CC -o "$gs_builddir/config-precomp-test.out" $CFLAGS $CPPFLAGS $LDFLAGS config-precomp-test.m $LIBS >>"$gs_logfile" 2>&1
if test ! "$?" = "0"; then
echo "Failure" >>"$gs_logfile" 2>&1
rm -f "$gs_builddir/config-precomp-test.out"
@ -101,8 +101,8 @@ echo "" >>"$gs_logfile" 2>&1
# Now try to compile again with the preprocessed header. It might get ignored - which is fine.
echo "** Compile the file with precompiled headers" >>"$gs_logfile" 2>&1
echo "$CC -o \"$gs_builddir/config-precomp-test.out\" $CFLAGS $CPPFLAGS $LDFLAGS $LIBS -I\"$gs_builddir\" config-precomp-test.m" >>"$gs_logfile" 2>&1
$CC -o "$gs_builddir/config-precomp-test.out" $CFLAGS $CPPFLAGS $LDFLAGS $LIBS -I"$gs_builddir" config-precomp-test.m >>"$gs_logfile" 2>&1
echo "$CC -o \"$gs_builddir/config-precomp-test.out\" $CFLAGS $CPPFLAGS $LDFLAGS -I\"$gs_builddir\" config-precomp-test.m $LIBS" >>"$gs_logfile" 2>&1
$CC -o "$gs_builddir/config-precomp-test.out" $CFLAGS $CPPFLAGS $LDFLAGS -I"$gs_builddir" config-precomp-test.m $LIBS >>"$gs_logfile" 2>&1
if test ! "$?" = "0"; then
echo "Failure" >>"$gs_logfile" 2>&1
rm -f "$gs_builddir/config-precomp-test.out" "$gs_builddir/config-precomp-test.h.gch"

4
configure vendored
View file

@ -7724,8 +7724,8 @@ else
_gs_cv_gcc_minor_version=""
_gs_cv_gcc_parsed_version="no: it's not gcc"
if test x"${GCC}" = x"yes" ; then
_gs_cv_gcc_major_version=`(${CC} -dumpversion | sed "s/\([^0-9]*\)\([0-9][0-9]*\)\([^0-9]*\)\([0-9][0-9]*\)\([^0-9]*.*\)/\2/") 2>&5`;
_gs_cv_gcc_minor_version=`(${CC} -dumpversion | sed "s/\([^0-9]*\)\([0-9][0-9]*\)\([^0-9]*\)\([0-9][0-9]*\)\([^0-9]*.*\)/\4/") 2>&5`;
_gs_cv_gcc_major_version=`(${CC} -dumpfullversion -dumpversion | sed "s/\([^0-9]*\)\([0-9][0-9]*\)\([^0-9]*\)\([0-9][0-9]*\)\([^0-9]*.*\)/\2/") 2>&5`;
_gs_cv_gcc_minor_version=`(${CC} -dumpfullversion -dumpversion | sed "s/\([^0-9]*\)\([0-9][0-9]*\)\([^0-9]*\)\([0-9][0-9]*\)\([^0-9]*.*\)/\4/") 2>&5`;
_gs_cv_gcc_parsed_version="${_gs_cv_gcc_major_version}.${_gs_cv_gcc_minor_version}";
fi

4
m4/gs_gcc_version.m4
View file

@ -39,8 +39,8 @@ AC_DEFUN([GS_CHECK_GCC_VERSION],dnl
dnl All square brackets are doubled because this file is processed by m4 first.
dnl Finally, any error messages are redirected to &5, so that they are logged
dnl into config.log but don't clutter the normal user output.
_gs_cv_gcc_major_version=`(${CC} -dumpversion | sed "s/\([[^0-9]]*\)\([[0-9]][[0-9]]*\)\([[^0-9]]*\)\([[0-9]][[0-9]]*\)\([[^0-9]]*.*\)/\2/") 2>&5`;
_gs_cv_gcc_minor_version=`(${CC} -dumpversion | sed "s/\([[^0-9]]*\)\([[0-9]][[0-9]]*\)\([[^0-9]]*\)\([[0-9]][[0-9]]*\)\([[^0-9]]*.*\)/\4/") 2>&5`;
_gs_cv_gcc_major_version=`(${CC} -dumpfullversion -dumpversion | sed "s/\([[^0-9]]*\)\([[0-9]][[0-9]]*\)\([[^0-9]]*\)\([[0-9]][[0-9]]*\)\([[^0-9]]*.*\)/\2/") 2>&5`;
_gs_cv_gcc_minor_version=`(${CC} -dumpfullversion -dumpversion | sed "s/\([[^0-9]]*\)\([[0-9]][[0-9]]*\)\([[^0-9]]*\)\([[0-9]][[0-9]]*\)\([[^0-9]]*.*\)/\4/") 2>&5`;
_gs_cv_gcc_parsed_version="${_gs_cv_gcc_major_version}.${_gs_cv_gcc_minor_version}";
fi
])

2
rules.make
View file

@ -229,7 +229,7 @@ ifeq ($(OBJC_RUNTIME_LIB), ng)
ifeq ($(ARC_CPPFLAGS),)
ARC_CPPFLAGS = -DGS_WITH_ARC=1
endif
INTERNAL_OBJC_FLAGS += $(ARC_OBJCFLAGS)
INTERNAL_OBJCFLAGS += $(ARC_OBJCFLAGS)
else
ARC_OBJCFLAGS=
ARC_CPPFLAGS=