mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-20 00:21:35 +00:00
Code Issues Releases Activity

Fix loading modules on current by adding patch from devel/imake-6 since

Browse Source 
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)
This commit is contained in:
Dejan Lesjak 2007-02-22 21:18:01 +00:00
parent b81ee0e870
commit b5cf96ec63
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=185711
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
x11-servers/xorg-server/Makefile.inc
View File

@ -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 \

38
x11-servers/xorg-server/files/patch-imake.c Normal file
View File

@ -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