commit 5dd913a4e2238c4dde1857583233a6df426f3d96
Author: Jan Rękorajski <[email protected]>
Date: Thu Mar 26 20:10:10 2015 +0100
- rename 64bit patch to lib64
- added libx32 patch
- rel 2
dev86-64bit.patch => bcc-lib64.patch | 0
bcc-libx32.patch | 20 ++++++++++++++++++++
bcc.spec | 8 ++++++--
3 files changed, 26 insertions(+), 2 deletions(-)
---
diff --git a/bcc.spec b/bcc.spec
index 741ea57..eec9ff6 100644
--- a/bcc.spec
+++ b/bcc.spec
@@ -2,7 +2,7 @@ Summary: Bruce's C compiler
Summary(pl.UTF-8): Kompilator C Bruce'a
Name: bcc
Version: 0.16.21
-Release: 1
+Release: 2
License: GPL
Group: Development/Languages
Source0: http://v3.sk/~lkundrak/dev86/Dev86src-%{version}.tar.gz
@@ -11,10 +11,11 @@ Patch0: Dev86src-noroot.patch
Patch1: Dev86src-opt.patch
Patch2: dev86-0.16.17-fortify.patch
Patch3: dev86-pic.patch
-Patch4: dev86-64bit.patch
+Patch4: %{name}-lib64.patch
Patch5: dev86-noelks.patch
Patch6: dev86-nostrip.patch
Patch7: dev86-make.patch
+Patch8: %{name}-libx32.patch
URL: http://v3.sk/~lkundrak/dev86/
Requires: bin86 >= %{version}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -48,6 +49,9 @@ są odwzorowywane do jednego z innych typów całkowitych.
%endif
%patch6 -p1
%patch7 -p1
+%if "%{_lib}" == "libx32"
+%patch8 -p1
+%endif
%{__mv} bootblocks/README README.bootblocks
%{__mv} copt/README README.copt
diff --git a/dev86-64bit.patch b/bcc-lib64.patch
similarity index 100%
rename from dev86-64bit.patch
rename to bcc-lib64.patch
diff --git a/bcc-libx32.patch b/bcc-libx32.patch
new file mode 100644
index 0000000..a627fa0
--- /dev/null
+++ b/bcc-libx32.patch
@@ -0,0 +1,20 @@
+--- dev86-0.16.17/bcc/bcc.c.fix 2005-01-03 23:41:55.000000000 +0100
++++ dev86-0.16.17/bcc/bcc.c 2006-12-27 16:32:57.000000000 +0100
+@@ -226,12 +226,12 @@
+
+ } else {
+ /* Relative paths to normal PREFIX directory */
+- default_include = build_libpath("-I", "/lib/bcc/include", "");
+- default_libdir = build_libpath("-L", "/lib/bcc", libdir_suffix);
+- optim_rules = build_libpath("-d", "/lib/bcc", libdir_suffix);
++ default_include = build_libpath("-I", "/libx32/bcc/include", "");
++ default_libdir = build_libpath("-L", "/libx32/bcc", libdir_suffix);
++ optim_rules = build_libpath("-d", "/libx32/bcc", libdir_suffix);
+
+- build_prefix("/lib/bcc", libdir_suffix, "");
+- build_prefix("/lib/bcc", "", "");
++ build_prefix("/libx32/bcc", libdir_suffix, "");
++ build_prefix("/libx32/bcc", "", "");
+ }
+
+ build_prefix("/bin", "", "");
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/bcc.git/commitdiff/5dd913a4e2238c4dde1857583233a6df426f3d96
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
