Mercurial > mxe-octave

changeset 2498:979decb2b36d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
package libf2c: remove runtime test and unnecessary makefile options
author Tony Theodore <tonyt@logyst.com>
date Fri, 04 May 2012 01:55:07 +1000
parents 3dfd08abb308
children 4ae84e92b8e2
files src/libf2c-1.patch src/libf2c.mk
diffstat 2 files changed, 34 insertions(+), 31 deletions(-) [+]
line wrap: on
line diff
--- a/src/libf2c-1.patch	Thu May 03 21:08:56 2012 +1000
+++ b/src/libf2c-1.patch	Fri May 04 01:55:07 2012 +1000
@@ -1,18 +1,10 @@
---- tmp-libf2c/makefile.u	2012-04-30 22:45:53.611478100 +0200
-+++ tmp-libf2c/makefile.xc	2012-04-30 22:46:13.201480616 +0200
-@@ -13,14 +13,17 @@
- # to the CFLAGS = line below.
- 
- .SUFFIXES: .c .o
--CC = cc
-+CC = $(TARGET)-gcc
-+AR = $(TARGET)-ar
-+RANLIB = $(TARGET)-ranlib
-+LD = $(TARGET)-ld
- SHELL = /bin/sh
--CFLAGS = -O
-+CFLAGS = -O -DUSE_CLOCK
- 
+This file is part of MXE.
+See index.html for further information.
+
+diff -ur libf2c.orig/makefile.u libf2c/makefile.u
+--- libf2c.orig/makefile.u	2012-05-04 01:39:36.000000000 +1000
++++ libf2c/makefile.u	2012-05-04 01:45:30.000000000 +1000
+@@ -20,7 +20,7 @@
  # compile, then strip unnecessary symbols
  .c.o:
  	$(CC) -c -DSkip_f2c_Undefs $(CFLAGS) $*.c
@@ -21,37 +13,47 @@
  	mv $*.xxx $*.o
  ## Under Solaris (and other systems that do not understand ld -x),
  ## omit -x in the ld line above.
-@@ -72,8 +75,8 @@
+@@ -72,8 +72,8 @@
  all: f2c.h signal1.h sysdep1.h libf2c.a
- 
+
  libf2c.a: $(OFILES)
 -	ar r libf2c.a $?
 -	-ranlib libf2c.a
 +	$(AR) r libf2c.a $?
 +	-$(RANLIB) libf2c.a
- 
+
  ## Shared-library variant: the following rule works on Linux
  ## systems.  Details are system-dependent.  Under Linux, -fPIC
-@@ -123,7 +126,7 @@
- 
+@@ -123,7 +123,7 @@
+
  install: libf2c.a
  	cp libf2c.a $(LIBDIR)
 -	-ranlib $(LIBDIR)/libf2c.a
 +	-$(RANLIB) $(LIBDIR)/libf2c.a
- 
+
  clean:
  	rm -f libf2c.a *.o arith.h signal1.h sysdep1.h
-@@ -183,10 +186,9 @@
+@@ -182,12 +182,6 @@
+ xwsne.o:	lio.h
  xwsne.o:	fmt.h
- 
- arith.h: arithchk.c
+
+-arith.h: arithchk.c
 -	$(CC) $(CFLAGS) -DNO_FPINIT arithchk.c -lm ||\
 -	 $(CC) -DNO_LONG_LONG $(CFLAGS) -DNO_FPINIT arithchk.c -lm
 -	./a.out >arith.h
 -	rm -f a.out arithchk.o
-+	$(CC) $(CFLAGS) -DNO_FPINIT arithchk.c -lm || $(CC) -DNO_LONG_LONG $(CFLAGS) -DNO_FPINIT arithchk.c -lm
-+	./a.exe >arith.h
-+	rm -f a.exe arithchk.o
- 
+-
  check:
  	xsum Notice README abort_.c arithchk.c backspac.c c_abs.c c_cos.c \
+ 	c_div.c c_exp.c c_log.c c_sin.c c_sqrt.c cabs.c close.c comptry.bat \
+
+diff -urN tmp-libf2c.orig/arith.h tmp-libf2c/arith.h
+--- tmp-libf2c.orig/arith.h	1970-01-01 10:00:00.000000000 +1000
++++ tmp-libf2c/arith.h	2012-05-04 01:16:16.000000000 +1000
+@@ -0,0 +1,5 @@
++#define IEEE_8087
++#define Arith_Kind_ASL 1
++#define Double_Align
++#define QNaN0 0x0
++#define QNaN1 0xfff80000
++
--- a/src/libf2c.mk	Thu May 03 21:08:56 2012 +1000
+++ b/src/libf2c.mk	Fri May 04 01:55:07 2012 +1000
@@ -4,13 +4,13 @@
 PKG             := libf2c
 $(PKG)_IGNORE   :=
 $(PKG)_CHECKSUM := f71066b41695738dec2261de71eaf02a1aaffe8b
-$(PKG)_SUBDIR   := 
+$(PKG)_SUBDIR   :=
 $(PKG)_FILE     := $(PKG).zip
 $(PKG)_URL      := http://www.netlib.org/f2c/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
-    echo 1 
+    echo 1
 endef
 
 define $(PKG)_BUILD
@@ -18,7 +18,8 @@
         CC=$(TARGET)-gcc \
         AR=$(TARGET)-ar \
         LD=$(TARGET)-ld \
-        RANLIB=$(TARGET)-ranlib
+        RANLIB=$(TARGET)-ranlib \
+        CFLAGS='-O -DUSE_CLOCK'
     $(INSTALL) -m644 '$(1)/libf2c.a' '$(PREFIX)/$(TARGET)/lib'
     $(INSTALL) -m644 '$(1)/f2c.h'    '$(PREFIX)/$(TARGET)/include'
 endef