diff options
| author | Dejan Lesjak <lesi@FreeBSD.org> | 2007-02-22 21:18:01 +0000 |
|---|---|---|
| committer | Dejan Lesjak <lesi@FreeBSD.org> | 2007-02-22 21:18:01 +0000 |
| commit | b5cf96ec632134cb896434ecdae3bdb26bb265c2 (patch) | |
| tree | 98a2415091ebfd14ae64ccb089eaa2e94083ddda /x11-servers/xorg-server | |
| parent | - update to 2.0.34 (diff) | |
Fix loading modules on current by adding patch from devel/imake-6 since
local copy of imake is used at configuring. Since FreeBSD versions older
than 300004 are not supported, simplify patch to just return elf for
default.
PR: ports/109091
Submitted by: Szilveszter Adam (sziszi at bsd dot hu)
Notes
Notes:
svn path=/head/; revision=185711
Diffstat (limited to 'x11-servers/xorg-server')
| -rw-r--r-- | x11-servers/xorg-server/Makefile.inc | 3 | ||||
| -rw-r--r-- | x11-servers/xorg-server/files/patch-imake.c | 38 |
2 files changed, 40 insertions, 1 deletions
diff --git a/x11-servers/xorg-server/Makefile.inc b/x11-servers/xorg-server/Makefile.inc index 7506c2e628a6..104c50c4afbf 100644 --- a/x11-servers/xorg-server/Makefile.inc +++ b/x11-servers/xorg-server/Makefile.inc @@ -42,7 +42,8 @@ CF_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-FreeBSD.cf \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-X11.tmpl \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-font-FreeType-ftfuncs.c \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-font-FreeType-ftfuncs.h \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-font-FreeType-ftsystem.c + ${PORTSDIR}/x11-servers/xorg-server/files/patch-font-FreeType-ftsystem.c \ + ${PORTSDIR}/x11-servers/xorg-server/files/patch-imake.c SERVER_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-Imakefile \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-Xext-xvmc.c \ diff --git a/x11-servers/xorg-server/files/patch-imake.c b/x11-servers/xorg-server/files/patch-imake.c new file mode 100644 index 000000000000..b0db655d28c5 --- /dev/null +++ b/x11-servers/xorg-server/files/patch-imake.c @@ -0,0 +1,38 @@ +--- config/imake/imake.c.orig Thu Feb 22 11:53:58 2007 ++++ config/imake/imake.c Thu Feb 22 11:56:06 2007 +@@ -1150,34 +1150,7 @@ + static void + get_binary_format(FILE *inFile) + { +- 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) +- iself = 1; +- if (objprog) +- pclose(objprog); +- +- fprintf(inFile, "#define DefaultToElfFormat %s\n", iself ? "YES" : "NO"); ++ fprintf(inFile, "#define DefaultToElfFormat YES\n"); + } + #endif + |