Commit Graph

100 Commits

Author SHA1 Message Date
e6d18b0591 Merge branch 'altlinux-4.0' 2007-11-10 13:27:49 +00:00
a6f4e2a41e More %_target_platform tweaks: cleanup build_os filter; initialize %_gnueabi; replace %_gnu with %_gnueabi in %_target_platform 2007-11-10 13:26:21 +00:00
Kirill A. Shutemov
ddab849441 - %_gnu appended to %_target_platform
- %_gnu is -gnueabi for gnueabi targets
2007-11-10 15:45:30 +03:00
Alexey Tourbin
abce94e210 platform.in: removed tcl stuff from %___build_pre (moved to tcl.env in rpm-build-tcl) 2007-08-01 16:49:44 +04:00
Alexey Tourbin
198276caed platform.in: removed tcl macros (moved them into rpm-build-tcl) 2007-08-01 16:45:44 +04:00
Alexey Tourbin
d55243bd02 platform.in: removed perl macros 2007-03-28 16:52:33 +04:00
Alexey Tourbin
85b13554f1 platform.in: moved the reset of python macros to rpm-build-python/python,
except for %__python_version, which is used in rpm-build-python.spec
2007-03-19 14:15:39 +03:00
Alexey Tourbin
0551d4e07e platform.in: removed python from %___build_pre, will be re-added in rpm-build-python/python.env 2007-03-19 13:36:52 +03:00
Alexey Tourbin
da04721ca4 platform.in: made %___build_pre modular, by sourcing /etc/rpm/macros.d/*.env
A few notes.

RPM uses only ^/etc/rpm/macros.d/[[:alnum:]_-]*[[:alnum:]]$
files to load macros.  The dot is not possible here, so there
will be no conflict between *.env and non-env files.

/etc/rpm/macros.d is now possibly misused, since the name implies
there must be macros.  However, *.env files can have macros, too.
The difference is that the macros from *.env files are expanded
and placed into %___build_pre, i.e. some rpm-tmp.* shell scripts.
Totally different semantics, but that's still about macros.

At least one *.env file is required to make 'cat *.env' happy.
I think I will updated the dependency on rpm-build-python,
which whill provide python.env file.
2007-03-19 13:01:04 +03:00
Alexey Tourbin
83e2b0cfe7 find-package: introduced RPM_FINDPACKAGE_PATH, which makes PATH search fully configurable
$ RPM_FINDPACKAGE_PATH=/usr/bin /usr/lib/rpm/shell.req -v /dev/stdin <<<arpsend
shell.req: /dev/stdin: arpsend indexed by: /usr/bin/arpsend -> arpsend, /usr/sbin/arpsend -> vzctl
shell.req: /dev/stdin: arpsend -> /usr/bin/arpsend -> arpsend (via content index)
arpsend
$ RPM_FINDPACKAGE_PATH=/usr/sbin /usr/lib/rpm/shell.req -v /dev/stdin <<<arpsend
shell.req: /dev/stdin: arpsend indexed by: /usr/sbin/arpsend -> vzctl, /usr/bin/arpsend -> arpsend
shell.req: /dev/stdin: arpsend -> /usr/sbin/arpsend -> vzctl (via content index)
vzctl
$

Also added %add_findpackage_path() and %set_findpackage_path() to platform.in.
2007-03-12 15:06:04 +03:00
Alexey Tourbin
9717c12847 autodeps/linux.{req,prov}.in: implemented method dispatcher
find-requires is now a dispatcher for /usr/lib/rpm/*.req scripts (methods).
find-provides is now a dispatcher for /usr/lib/rpm/*.prov scripts (methods).

The algorithm is basically as follows:

1) Filter input file list through TOPDIR and SKIPLIST patterns.

2) Run the resulting file list through file(1), which output is (per line)

<input-file-name><tab><optional-single-space><file-magic-type>

3) For each req/prov methods, there must be corresponding *.files
filter (e.g. /usr/lib/rpm/perl.req.files for /usr/lib/rpm/perl.req).
We feed file(1) output to this filter; the filter must print the list
of <input-files-name>s (per line) which will be processed with the
corresponding req/prov method.

4) Each req/prov method is invoked with corresponding file list on its
standard input.  The method must output valid rpm dependencies (per line)
or exit with non-zero code.

Notes:

Unlike find-requires, find-provides runs file(1) with -L option.

RPM_FINDREQ_DEFAULT_METHOD and RPM_FINDPROV_DEFAULT go away.
All available methods are run by default.

The old code has been kept.  I am going to remove it gradually
as I factor particular req/prov scripts.
2007-03-11 15:00:20 +03:00
7227d450ca Merge branch 'master' of git.alt:/people/damir/packages/rpm 2007-02-11 22:08:09 +00:00
Damir Shayhutdinov
280e69d9a5 Added hooks for Java autoreq facility.
Signed-off-by: Damir Shayhutdinov <damir@altlinux.ru>
2007-02-10 19:16:04 +03:00
94bd71f657 platform.in: Change %optflags_kernel to %nil 2006-12-18 17:00:44 +00:00
f2f42b1c47 platform.in: Add %_target_libdir macro. 2006-11-29 18:15:01 +00:00
f283a6dc1a Implement mono reqprov hooks and enable them by default (#9426). 2006-10-04 16:18:31 +00:00
5416277102 Removed cvsid tags. 2006-05-14 17:05:34 +04:00
67cb12effe set %_verify_elf_method to arch=normal,fhs=normal,rpath=normal,stack=normal,textrel=normal,unresolved=normal 2006-04-04 16:46:59 +00:00
6b1b5ce9f6 %_verify_elf_method: change unresolved from relaxed to normal 2006-03-07 16:14:59 +00:00
d4e91888c0 %configure: export lt_cv_deplibs_check_method=pass_all 2006-03-06 00:09:34 +00:00
11d28a0ec7 %___build_pre: export RPM_TARGET_ARCH and RPM_TARGET_OS 2006-02-24 01:38:13 +00:00
a21f483419 set %_verify_elf_method to arch=normal,fhs=relaxed,rpath=normal,textrel=normal,unresolved=relaxed 2006-02-24 00:54:46 +00:00
04617b2165 updated %_x11*dir (#8825) 2006-02-21 15:53:42 +00:00
c30c9e66fa added %_niconsdir, updated %_miconsdir and %_liconsdir (#9067). 2006-02-21 15:48:15 +00:00
9506eb04e8 Implemented pkgconfig reqprov support and enabled it by default. 2006-02-02 01:51:38 +00:00
b6141a34ee set %_verify_elf_method to fhs=relaxed,rpath=normal,textrel=normal,unresolved=relaxed 2006-01-14 20:46:07 +00:00
300cc80691 set default %_findprov_lib_path to %nil. 2006-01-11 01:37:38 +00:00
6bdaa71a41 Add macros: %_desktopdir, %_pixmapsdir 2006-01-09 21:00:23 +00:00
8b89fa4895 Added __autoconf macro (#8307). 2005-11-30 17:26:33 +00:00
91c34abd4c Added --disable-dependency-tracking to %configure (#8558). 2005-11-30 17:13:02 +00:00
87650a4c3d Maintain noarch as self-contained architecture (mouse@) 2005-10-10 14:32:55 +00:00
c768516948 fixed _pam_so_suffix and _pam_name_suffix usage 2005-10-06 01:21:58 +00:00
127f6e30c2 fixed %__python_version definition (quoted % characters) 2005-10-05 23:21:02 +00:00
9835799623 Added x86_64 support. 2005-06-16 16:18:15 +00:00
2c8b5c1d83 added %_rpmlibdir 2005-06-15 16:06:07 +00:00
3772e5342c export RPM_LIB and RPM_LIBDIR variables 2005-02-10 13:59:13 +00:00
d2a253bbd7 new macros: %_x11x11dir, %_pkgconfigdir 2005-02-10 12:46:22 +00:00
03b729ee21 %configure: export lt_cv_prog_cc_static_works depending on %_disable_static/%_enable_static 2005-01-08 16:12:50 +00:00
1118314978 Added tcl findreqprov support (Sergey Bolshakov, #5364) 2004-10-31 13:39:22 +00:00
f997f08c83 python support, #5291 2004-10-31 12:00:56 +00:00
dae8ffba77 removed %add_buildrequires, changed macros to modify %_buildrequires_build directly 2004-06-27 22:31:10 +00:00
7c9121008f fixed typo iin %add_python_lib_path() 2004-06-27 16:39:26 +00:00
7df5facca8 fix typo in %set_*_version() made in previous commit 2004-06-27 16:33:03 +00:00
ddde83d09d new macro: %add_buildrequires(b)
%set_*_version: use it
2004-06-27 13:32:08 +00:00
a4ff7029cc run scrollkeeper-update quietly (#4485) 2004-06-26 22:27:25 +00:00
3240fd9ec5 added python to default lists of find{req,prov} methods 2004-05-17 14:56:42 +00:00
da2fd83221 more python macros from Andrey Orlov 2004-04-28 17:03:24 +00:00
10ad350dbb added force_* macros 2004-02-22 18:17:44 +00:00
985f2b1512 implemented %%_keep_libtool_files support 2004-01-21 16:08:37 +00:00
66026d1cb6 s/rpm -q/rpmquery/g; corrected %__python_version definition (#3311) 2003-11-24 15:07:48 +00:00