fixes missng restore stack address. PR pkg/47906 Bump PKGREVISION.diff -r1.17 -r1.18 pkgsrc/lang/g95/Makefile
(obache)
@@ -1,60 +1,60 @@ | @@ -1,60 +1,60 @@ | |||
1 | # $NetBSD: Makefile,v 1.17 2013/06/01 14:44:01 tron Exp $ | 1 | # $NetBSD: Makefile,v 1.18 2013/07/28 12:54:52 obache Exp $ | |
2 | 2 | |||
3 | DISTNAME= g95_source | 3 | DISTNAME= g95_source | |
4 | PKGNAME= g95-0.93 | 4 | PKGNAME= g95-0.93 | |
5 | PKGREVISION= 2 | 5 | PKGREVISION= 3 | |
6 | CATEGORIES= lang | 6 | CATEGORIES= lang | |
7 | MASTER_SITES= http://ftp.g95.org/v${PKGVERSION_NOREV}/ | 7 | MASTER_SITES= http://ftp.g95.org/v${PKGVERSION_NOREV}/ | |
8 | EXTRACT_SUFX= .tgz | 8 | EXTRACT_SUFX= .tgz | |
9 | DISTFILES= ${DEFAULT_DISTFILES} gcc-core-${GCC_VER}.tar.bz2 | 9 | DISTFILES= ${DEFAULT_DISTFILES} gcc-core-${GCC_VER}.tar.bz2 | |
10 | SITES.gcc-core-4.1.2.tar.bz2= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_VER}/} | 10 | SITES.gcc-core-4.1.2.tar.bz2= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_VER}/} | |
11 | 11 | |||
12 | MAINTAINER= wennmach@NetBSD.org | 12 | MAINTAINER= wennmach@NetBSD.org | |
13 | HOMEPAGE= http://www.g95.org/ | 13 | HOMEPAGE= http://www.g95.org/ | |
14 | COMMENT= Fortran 95 compiler from g95.org | 14 | COMMENT= Fortran 95 compiler from g95.org | |
15 | LICENSE= gnu-gpl-v2 | 15 | LICENSE= gnu-gpl-v2 | |
16 | 16 | |||
17 | USE_TOOLS+= gmake gtar | 17 | USE_TOOLS+= gmake gtar | |
18 | GNU_CONFIGURE= yes | 18 | GNU_CONFIGURE= yes | |
19 | CONFIGURE_ARGS+= --with-gcc-dir=${GCC_DIR} | 19 | CONFIGURE_ARGS+= --with-gcc-dir=${GCC_DIR} | |
20 | WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} | 20 | WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} | |
21 | PLIST_SUBST+= MACHINE_GNU_PLATFORM=${MACHINE_GNU_PLATFORM:Q} | 21 | PLIST_SUBST+= MACHINE_GNU_PLATFORM=${MACHINE_GNU_PLATFORM:Q} | |
22 | 22 | |||
23 | GCC_VER= 4.1.2 | 23 | GCC_VER= 4.1.2 | |
24 | GCC_DIR= ${WRKDIR}/gcc-${GCC_VER} | 24 | GCC_DIR= ${WRKDIR}/gcc-${GCC_VER} | |
25 | GCC_G95_DIR= ${GCC_DIR}/g95 | 25 | GCC_G95_DIR= ${GCC_DIR}/g95 | |
26 | GCC_CONFIGURE_SCRIPT= ../configure | 26 | GCC_CONFIGURE_SCRIPT= ../configure | |
27 | GCC_CONFIGURE_ARGS= ${CONFIGURE_ARGS} | 27 | GCC_CONFIGURE_ARGS= ${CONFIGURE_ARGS} | |
28 | GCC_CONFIGURE_ARGS+= --enable-languages=c | 28 | GCC_CONFIGURE_ARGS+= --enable-languages=c | |
29 | GCC_CONFIGURE_ARGS+= --disable-multilib | 29 | GCC_CONFIGURE_ARGS+= --disable-multilib | |
30 | 30 | |||
31 | .include "../../mk/bsd.prefs.mk" | 31 | .include "../../mk/bsd.prefs.mk" | |
32 | .if ${OPSYS} == "SunOS" | 32 | .if ${OPSYS} == "SunOS" | |
33 | GCC_CONFIGURE_ENV+= OBJDUMP=/usr/sfw/bin/gobjdump | 33 | GCC_CONFIGURE_ENV+= OBJDUMP=/usr/sfw/bin/gobjdump | |
34 | GCC_CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/ccs/bin/ld | 34 | GCC_CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/ccs/bin/ld | |
35 | . if !exists(/usr/sfw/bin/gas) | 35 | . if !exists(/usr/sfw/bin/gas) | |
36 | GCC_CONFIGURE_ARGS+= --without-gnu-as --with-as=/usr/ccs/bin/as | 36 | GCC_CONFIGURE_ARGS+= --without-gnu-as --with-as=/usr/ccs/bin/as | |
37 | . else | 37 | . else | |
38 | GCC_CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/sfw/bin/gas | 38 | GCC_CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/sfw/bin/gas | |
39 | . endif | 39 | . endif | |
40 | .endif | 40 | .endif | |
41 | 41 | |||
42 | post-extract: | 42 | post-extract: | |
43 | ${MKDIR} ${GCC_G95_DIR} | 43 | ${MKDIR} ${GCC_G95_DIR} | |
44 | cd ${WRKSRC} && ${GTAR} -xzf libf95.a-${PKGVERSION_NOREV}.tar.gz | 44 | cd ${WRKSRC} && ${GTAR} -xzf libf95.a-${PKGVERSION_NOREV}.tar.gz | |
45 | 45 | |||
46 | pre-configure: | 46 | pre-configure: | |
47 | rm -f ${GCC_DIR}/config.sub ${GCC_DIR}/config.guess | 47 | rm -f ${GCC_DIR}/config.sub ${GCC_DIR}/config.guess | |
48 | ln -fs ${PKGSRCDIR}/mk/gnu-config/config.sub ${GCC_DIR}/config.sub | 48 | ln -fs ${PKGSRCDIR}/mk/gnu-config/config.sub ${GCC_DIR}/config.sub | |
49 | ln -fs ${PKGSRCDIR}/mk/gnu-config/config.guess ${GCC_DIR}/config.guess | 49 | ln -fs ${PKGSRCDIR}/mk/gnu-config/config.guess ${GCC_DIR}/config.guess | |
50 | cd ${GCC_G95_DIR} && ${GCC_CONFIGURE_SCRIPT} ${GCC_CONFIGURE_ARGS} && ${GMAKE} | 50 | cd ${GCC_G95_DIR} && ${GCC_CONFIGURE_SCRIPT} ${GCC_CONFIGURE_ARGS} && ${GMAKE} | |
51 | 51 | |||
52 | post-build: | 52 | post-build: | |
53 | cd ${WRKSRC}/libf95.a-${PKGVERSION_NOREV} && ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} && ${GMAKE} | 53 | cd ${WRKSRC}/libf95.a-${PKGVERSION_NOREV} && ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} && ${GMAKE} | |
54 | 54 | |||
55 | post-install: | 55 | post-install: | |
56 | cd ${WRKSRC}/libf95.a-${PKGVERSION_NOREV} && ${GMAKE} install DESTDIR=${DESTDIR:Q} | 56 | cd ${WRKSRC}/libf95.a-${PKGVERSION_NOREV} && ${GMAKE} install DESTDIR=${DESTDIR:Q} | |
57 | cd ${DESTDIR}${PREFIX}/bin && ${LN} -sf ${MACHINE_GNU_PLATFORM:Q}-g95 g95 | 57 | cd ${DESTDIR}${PREFIX}/bin && ${LN} -sf ${MACHINE_GNU_PLATFORM:Q}-g95 g95 | |
58 | cd ${DESTDIR}${PREFIX}/bin && ${LN} -sf ${MACHINE_GNU_PLATFORM:Q}-g95 f95 | 58 | cd ${DESTDIR}${PREFIX}/bin && ${LN} -sf ${MACHINE_GNU_PLATFORM:Q}-g95 f95 | |
59 | 59 | |||
60 | .include "../../mk/bsd.pkg.mk" | 60 | .include "../../mk/bsd.pkg.mk" |
@@ -1,28 +1,29 @@ | @@ -1,28 +1,29 @@ | |||
1 | $NetBSD: distinfo,v 1.15 2013/05/20 05:47:34 adam Exp $ | 1 | $NetBSD: distinfo,v 1.16 2013/07/28 12:54:52 obache Exp $ | |
2 | 2 | |||
3 | SHA1 (g95_source.tgz) = b5e503fd6459b65cbda73190685f9490230d9cff | 3 | SHA1 (g95_source.tgz) = b5e503fd6459b65cbda73190685f9490230d9cff | |
4 | RMD160 (g95_source.tgz) = 98d03e9a1835f4b3553a72a798bdf1d90a757176 | 4 | RMD160 (g95_source.tgz) = 98d03e9a1835f4b3553a72a798bdf1d90a757176 | |
5 | Size (g95_source.tgz) = 1355198 bytes | 5 | Size (g95_source.tgz) = 1355198 bytes | |
6 | SHA1 (gcc-core-4.1.2.tar.bz2) = d6875295f6df1bec4a6f4ab8f0da54bfb8d97306 | 6 | SHA1 (gcc-core-4.1.2.tar.bz2) = d6875295f6df1bec4a6f4ab8f0da54bfb8d97306 | |
7 | RMD160 (gcc-core-4.1.2.tar.bz2) = 612cbd5b795f7095fb3f565e6a8eaaee82c472c5 | 7 | RMD160 (gcc-core-4.1.2.tar.bz2) = 612cbd5b795f7095fb3f565e6a8eaaee82c472c5 | |
8 | Size (gcc-core-4.1.2.tar.bz2) = 17485561 bytes | 8 | Size (gcc-core-4.1.2.tar.bz2) = 17485561 bytes | |
9 | SHA1 (patch-ab) = 74187ee99e3e383333219cbc53676c07ca03ff19 | 9 | SHA1 (patch-ab) = 74187ee99e3e383333219cbc53676c07ca03ff19 | |
10 | SHA1 (patch-ac) = b20a90cc2f9078cf0048980b75fa6836da0f28a8 | 10 | SHA1 (patch-ac) = b20a90cc2f9078cf0048980b75fa6836da0f28a8 | |
11 | SHA1 (patch-gcc_config.gcc) = 9da8f32372c64b1590d97e3f26aec0d5652cc959 | 11 | SHA1 (patch-gcc_config.gcc) = 9da8f32372c64b1590d97e3f26aec0d5652cc959 | |
12 | SHA1 (patch-gcc_config_dragonfly-spec.h) = bf0c97caa314714542cf8cc63fdf0c73bda80511 | 12 | SHA1 (patch-gcc_config_dragonfly-spec.h) = bf0c97caa314714542cf8cc63fdf0c73bda80511 | |
13 | SHA1 (patch-gcc_config_dragonfly.h) = 6d46b7b4637a20b36e19a15e1eaffdfff6638de9 | 13 | SHA1 (patch-gcc_config_dragonfly.h) = 6d46b7b4637a20b36e19a15e1eaffdfff6638de9 | |
14 | SHA1 (patch-gcc_config_i386_dragonfly.h) = 7d60d29b5ae636d69650e8c412a94f7a6045f6d9 | 14 | SHA1 (patch-gcc_config_i386_dragonfly.h) = 7d60d29b5ae636d69650e8c412a94f7a6045f6d9 | |
15 | SHA1 (patch-gcc_config_i386_dragonfly64.h) = 9d2d8512a913e58055fa5c1b7d85a109117dcfba | 15 | SHA1 (patch-gcc_config_i386_dragonfly64.h) = 9d2d8512a913e58055fa5c1b7d85a109117dcfba | |
16 | SHA1 (patch-gcc_config_t-dragonfly) = dd8d5919af737dfb9e3c18be9a41b4e2c6f31155 | 16 | SHA1 (patch-gcc_config_t-dragonfly) = dd8d5919af737dfb9e3c18be9a41b4e2c6f31155 | |
17 | SHA1 (patch-gcc_config_t-dragonfly-thread) = ebdb58dacf0dc5d0bf2f1f1707a7c6ab29ee308c | 17 | SHA1 (patch-gcc_config_t-dragonfly-thread) = ebdb58dacf0dc5d0bf2f1f1707a7c6ab29ee308c | |
18 | SHA1 (patch-gcc_ginclude_stddef.h) = 60f51a470e03173803b5e20b1fa4d6882e8d1fe9 | 18 | SHA1 (patch-gcc_ginclude_stddef.h) = 60f51a470e03173803b5e20b1fa4d6882e8d1fe9 | |
19 | SHA1 (patch-gcc_toplev.h) = 4894b45bf0fd30de0610a36827ef1089e0ec6bd5 | 19 | SHA1 (patch-gcc_toplev.h) = 4894b45bf0fd30de0610a36827ef1089e0ec6bd5 | |
20 | SHA1 (patch-libf95.a-0.92_configure) = e23998692b410acaabaf24f591b659d2b229bcca | 20 | SHA1 (patch-libf95.a-0.92_configure) = e23998692b410acaabaf24f591b659d2b229bcca | |
21 | SHA1 (patch-libf95.a-0.92_io_atof.c) = 0c3a209815be3a97d984cb9a15ee888f93110d1d | 21 | SHA1 (patch-libf95.a-0.92_io_atof.c) = 0c3a209815be3a97d984cb9a15ee888f93110d1d | |
22 | SHA1 (patch-libf95.a-0.93_intrinsics_dot__product10.c) = a2fe19bab2a6f719f541692fd4ef7e67766a18e5 | 22 | SHA1 (patch-libf95.a-0.93_intrinsics_dot__product10.c) = a2fe19bab2a6f719f541692fd4ef7e67766a18e5 | |
23 | SHA1 (patch-libf95.a-0.93_intrinsics_matmul10.c) = 30609c3183a98610e4005fd4c0d12cccec0855a1 | 23 | SHA1 (patch-libf95.a-0.93_intrinsics_matmul10.c) = 30609c3183a98610e4005fd4c0d12cccec0855a1 | |
24 | SHA1 (patch-libf95.a-0.93_intrinsics_random.c) = 5445f78b267f742a2bf711aa0f5e06683dda1a68 | 24 | SHA1 (patch-libf95.a-0.93_intrinsics_random.c) = 5445f78b267f742a2bf711aa0f5e06683dda1a68 | |
25 | SHA1 (patch-libf95.a-0.93_io_read.c) = 594bcfb15e59dcaaec5a6a21a58af17e8f41eae9 | 25 | SHA1 (patch-libf95.a-0.93_io_read.c) = 594bcfb15e59dcaaec5a6a21a58af17e8f41eae9 | |
26 | SHA1 (patch-libf95.a-0.93_math_ff.c) = 353121bc08a86765d18b0e6f051ba91f7e65e9c2 | 26 | SHA1 (patch-libf95.a-0.93_math_ff.c) = 353121bc08a86765d18b0e6f051ba91f7e65e9c2 | |
27 | SHA1 (patch-libf95.a-0.93_math_x87.S) = d1eb02bd2358b6abb9b8dc3e32629cba540adcc4 | 27 | SHA1 (patch-libf95.a-0.93_math_x87.S) = d1eb02bd2358b6abb9b8dc3e32629cba540adcc4 | |
28 | SHA1 (patch-libf95.a-0.93_quad_power16.c) = fc7375aa90ecf75bb8ba26d41739614040b16e09 | 28 | SHA1 (patch-libf95.a-0.93_quad_power16.c) = fc7375aa90ecf75bb8ba26d41739614040b16e09 | |
29 | SHA1 (patch-libf95.a-0.93_runtime_main.c) = 8b870b363c3f0d108979fe44248632b77258eb0d |
$NetBSD: patch-libf95.a-0.93_runtime_main.c,v 1.1 2013/07/28 12:54:52 obache Exp $
* fixes missing restore stack address. PR pkg/47906
--- libf95.a-0.93/runtime/main.c.orig 2010-04-18 15:47:28.000000000 +0000
+++ libf95.a-0.93/runtime/main.c
@@ -50,9 +50,11 @@ int main(int argc, char *argv[]) {
* unaligned. */
#if HAVE_REAL_10 == 1 || HAVE_REAL_10 == 2
+ int diff;
asm("mov %%esp, %%eax\n"
"and $0x04, %%eax\n"
- "sub %%eax, %%esp\n" : : : "%eax");
+ "movl %%eax, %0\n"
+ "sub %%eax, %%esp\n" : "=r"(diff) : : "%eax");
#endif
g95_runtime_start(argc, argv);
@@ -62,5 +64,10 @@ int main(int argc, char *argv[]) {
memory_done();
g95_runtime_stop();
+#if HAVE_REAL_10 == 1 || HAVE_REAL_10 == 2
+ asm("mov %0, %%eax\n"
+ "add %%eax, %%esp\n" : : "r"(diff) : "%eax");
+#endif
+
return 0;
}