diff options
| author | dholland <dholland> | 2011-08-29 01:39:11 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2011-08-29 01:39:11 +0000 |
| commit | c0dd916e2b64f44a745548c8962a9d01c74d9bfd (patch) | |
| tree | 5d73d0bf870a6cc59a708e3cc2fa565c2e43c56d /devel/bin86 | |
| parent | 4b08633d42451da3fa97532d4f7346daef2adcb3 (diff) | |
| download | pkgsrc-c0dd916e2b64f44a745548c8962a9d01c74d9bfd.tar.gz | |
Fix mismatched return statements, which clang dislikes
Diffstat (limited to 'devel/bin86')
| -rw-r--r-- | devel/bin86/distinfo | 4 | ||||
| -rw-r--r-- | devel/bin86/patches/patch-ab | 39 |
2 files changed, 34 insertions, 9 deletions
diff --git a/devel/bin86/distinfo b/devel/bin86/distinfo index 6b48c7e14a6..11325ecec29 100644 --- a/devel/bin86/distinfo +++ b/devel/bin86/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.2 2008/08/02 21:46:33 dholland Exp $ +$NetBSD: distinfo,v 1.3 2011/08/29 01:39:11 dholland Exp $ SHA1 (bin86-0.16.17.tar.gz) = 656f06b4b26d08412132e338baa25e42d713eeec RMD160 (bin86-0.16.17.tar.gz) = b0ae5aff632a3528214749e256f5ab498f1a7fa4 Size (bin86-0.16.17.tar.gz) = 152400 bytes SHA1 (patch-aa) = f4a4fcc5cb51fb428a660d0fc70579f73e2de719 -SHA1 (patch-ab) = b5876c050630d5acec5b8bf1b3079125f112b6be +SHA1 (patch-ab) = 31ae26539959cc1484d2754772f97dd85dc47716 SHA1 (patch-ac) = 2f6e342013396561278bb78571148ec7ce3d32d2 diff --git a/devel/bin86/patches/patch-ab b/devel/bin86/patches/patch-ab index abbc5925f2d..0aa58092806 100644 --- a/devel/bin86/patches/patch-ab +++ b/devel/bin86/patches/patch-ab @@ -1,8 +1,25 @@ -$NetBSD: patch-ab,v 1.1 2008/08/02 21:46:33 dholland Exp $ +$NetBSD: patch-ab,v 1.2 2011/08/29 01:39:12 dholland Exp $ ---- ld/catimage.c~ 1997-07-22 17:38:12.000000000 -0400 -+++ ld/catimage.c 2008-08-02 17:43:47.000000000 -0400 -@@ -39,7 +39,7 @@ main(argc, argv) +- build on LP64 +- fix mismatched return statements, which clang dislikes + +--- ld/catimage.c.orig 1997-07-22 21:38:12.000000000 +0000 ++++ ld/catimage.c +@@ -27,6 +27,8 @@ + #error "Compile error: struct exec invalid (long not 32 bit ?)" + #endif + ++static void patch_bin(long, int); ++ + unsigned long text_offt[10]; /* Locations to patch (0=don't) */ + unsigned long data_offt[10]; + +@@ -35,11 +37,12 @@ FILE * ofd; + FILE * ifd = 0; + struct exec header; + ++int + main(argc, argv) int argc; char ** argv; { @@ -11,7 +28,7 @@ $NetBSD: patch-ab,v 1.1 2008/08/02 21:46:33 dholland Exp $ int image_id; if( argc < 3 || argc > 11 ) -@@ -59,8 +59,10 @@ char ** argv; +@@ -59,8 +62,10 @@ char ** argv; open_obj(argv[image_id+2]); printf("File %-14s seg=0x%04lx text=0x%04lx data=0x%04lx\n", @@ -24,7 +41,7 @@ $NetBSD: patch-ab,v 1.1 2008/08/02 21:46:33 dholland Exp $ text_off = image_offset; if( header.a_flags & A_SEP ) -@@ -90,7 +92,7 @@ char ** argv; +@@ -90,7 +95,7 @@ char ** argv; fputc('\0', ofd); fclose(ofd); @@ -33,7 +50,15 @@ $NetBSD: patch-ab,v 1.1 2008/08/02 21:46:33 dholland Exp $ if( ifd ) fclose(ifd); exit(0); -@@ -162,7 +164,7 @@ read_symtable() +@@ -139,6 +144,7 @@ long out_offset, in_offset, length; + } + } + ++void + patch_bin(file_off, value) + long file_off; + int value; +@@ -162,7 +168,7 @@ read_symtable() { struct nlist item; int nitems; |