rpms/sbcl/devel my_setarch.c,NONE,1.1 sbcl.spec,1.13,1.14
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Thu Sep 22 14:10:31 UTC 2005
Author: rdieter
Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12159
Modified Files:
sbcl.spec
Added Files:
my_setarch.c
Log Message:
* Thu Sep 22 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.4-19
- drop use of setarch, use my_setarch.c
--- NEW FILE my_setarch.c ---
#include <stdio.h>
#include <sys/personality.h>
#include <stdlib.h>
#include <unistd.h>
int main(int argc, char **argv) {
if ( argc >= 2 ) {
long pers = personality(-1);
/* 0x40000 aka. ADDR_NO_RANDOMIZE */
if (!(pers & 0x40000)) {
if (personality(pers | 0x40000) == -1) {
fprintf(stderr, "WARNING: Couldn't set the proper personality flags. Trying to continue anyway.\n");
}
}
/* fprintf (stdout, "DEBUG: execing %s with arg %s",argv[1],&argv[1]); */
execvp(argv[1], &argv[1]);
}
exit(0);
}
Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sbcl.spec 21 Sep 2005 13:47:15 -0000 1.13
+++ sbcl.spec 22 Sep 2005 14:10:29 -0000 1.14
@@ -7,26 +7,10 @@
#define sbcl_bootstrap cmucl
#define sbcl_bootstrap clisp
-%if "%{?bootstrap}" == "%{nil}"
-%if "%{?fedora}" >= "3"
-BuildRequires:setarch
-%define setarch setarch %{_target_cpu}
-%endif
-
-%if "%{?fedora}" >= "4"
-%define setarch setarch %{_target_cpu} -R
-%endif
-
-%if "%{?rhel}" >= "3"
-BuildRequires:setarch
-%define setarch setarch %{_target_cpu}
-%endif
-%endif
-
Name: sbcl
Summary: Steel Bank Common Lisp
Version: 0.9.4
-Release: 17%{?dist}
+Release: 19%{?dist}
License: BSD/MIT
Group: Development/Languages
@@ -52,6 +36,8 @@
%endif
%endif
+Source100: my_setarch.c
+
Patch1: sbcl-0.8.18-default-sbcl-home.patch
Patch2: sbcl-0.9.4-personality.patch
Patch3: sbcl-0.9.4-optflags.patch
@@ -113,6 +99,9 @@
%if "%{?sbcl_bootstrap}" == "%{nil}"
export SBCL_HOME=`pwd`/sbcl-bootstrap/lib/sbcl
export PATH=`pwd`/sbcl-bootstrap/bin:${PATH}
+
+%{__cc} -o my_setarch %{optflags} %{SOURCE100}
+%define setarch ./my_setarch
%endif
%{?setarch} ./make.sh %{?bootstrap}
@@ -172,6 +161,9 @@
%changelog
+* Thu Sep 22 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.4-19
+- drop use of setarch, use my_setarch.c
+
* Mon Sep 19 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.4-17
- rework personality/reexec patch (execve -> execvp)
More information about the fedora-extras-commits
mailing list