diff options
| author | kris <kris@FreeBSD.org> | 2007-01-31 04:23:33 +0800 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2007-01-31 04:23:33 +0800 |
| commit | c8d75a26fd83cb14927d3c16a0a0aac533724eb0 (patch) | |
| tree | 6323ecda33f41cc2c9f7b30924291b5081558e5d /devel | |
| parent | aa47494b3b100fc9acb7ecfda7f679eee714a054 (diff) | |
| download | freebsd-ports-gnome-c8d75a26fd83cb14927d3c16a0a0aac533724eb0.tar.gz freebsd-ports-gnome-c8d75a26fd83cb14927d3c16a0a0aac533724eb0.tar.zst freebsd-ports-gnome-c8d75a26fd83cb14927d3c16a0a0aac533724eb0.zip | |
Drop support for checking objformat, and default to elf, not a.out.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/imake-6/Makefile | 1 | ||||
| -rw-r--r-- | devel/imake-6/files/patch-imake.c | 35 |
2 files changed, 36 insertions, 0 deletions
diff --git a/devel/imake-6/Makefile b/devel/imake-6/Makefile index 4299981b7f82..dadda6d56a4f 100644 --- a/devel/imake-6/Makefile +++ b/devel/imake-6/Makefile @@ -7,6 +7,7 @@ PORTNAME= imake PORTVERSION= 6.9.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_XORG} MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src diff --git a/devel/imake-6/files/patch-imake.c b/devel/imake-6/files/patch-imake.c new file mode 100644 index 000000000000..7c3ffee0b65f --- /dev/null +++ b/devel/imake-6/files/patch-imake.c @@ -0,0 +1,35 @@ +--- imake/imake.c.orig Tue Jan 30 14:57:37 2007 ++++ imake/imake.c Tue Jan 30 14:55:59 2007 +@@ -1153,29 +1153,17 @@ + int mib[2]; + size_t len; + int osrel = 0; +- FILE *objprog = NULL; + int iself = 0; +- char buf[10]; +- char cmd[PATH_MAX]; + + mib[0] = CTL_KERN; + mib[1] = KERN_OSRELDATE; + len = sizeof(osrel); + sysctl(mib, 2, &osrel, &len, NULL, 0); +- if (CrossCompiling) { +- strcpy (cmd, CrossCompileDir); +- strcat (cmd, "/"); +- strcat (cmd,"objformat"); +- } else +- strcpy (cmd, "objformat"); + +- if (osrel >= 300004 && +- (objprog = popen(cmd, "r")) != NULL && +- fgets(buf, sizeof(buf), objprog) != NULL && +- strncmp(buf, "elf", 3) == 0) ++ if (osrel < 300004) ++ iself = 0; ++ else + iself = 1; +- if (objprog) +- pclose(objprog); + + fprintf(inFile, "#define DefaultToElfFormat %s\n", iself ? "YES" : "NO"); + } |