RHEL 9.0.0 Alpha bootstrap
The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/multilib-rpm-config#385d8b95b889e9268ceb4d65a075bdf2f9e0c804
This commit is contained in:
parent
3cb3566992
commit
1d85d8a006
1
.gitignore
vendored
1
.gitignore
vendored
@ -0,0 +1 @@
|
||||
noarch
|
339
COPYING
Normal file
339
COPYING
Normal file
@ -0,0 +1,339 @@
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 2, June 1991
|
||||
|
||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The licenses for most software are designed to take away your
|
||||
freedom to share and change it. By contrast, the GNU General Public
|
||||
License is intended to guarantee your freedom to share and change free
|
||||
software--to make sure the software is free for all its users. This
|
||||
General Public License applies to most of the Free Software
|
||||
Foundation's software and to any other program whose authors commit to
|
||||
using it. (Some other Free Software Foundation software is covered by
|
||||
the GNU Lesser General Public License instead.) You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
this service if you wish), that you receive source code or can get it
|
||||
if you want it, that you can change the software or use pieces of it
|
||||
in new free programs; and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to make restrictions that forbid
|
||||
anyone to deny you these rights or to ask you to surrender the rights.
|
||||
These restrictions translate to certain responsibilities for you if you
|
||||
distribute copies of the software, or if you modify it.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must give the recipients all the rights that
|
||||
you have. You must make sure that they, too, receive or can get the
|
||||
source code. And you must show them these terms so they know their
|
||||
rights.
|
||||
|
||||
We protect your rights with two steps: (1) copyright the software, and
|
||||
(2) offer you this license which gives you legal permission to copy,
|
||||
distribute and/or modify the software.
|
||||
|
||||
Also, for each author's protection and ours, we want to make certain
|
||||
that everyone understands that there is no warranty for this free
|
||||
software. If the software is modified by someone else and passed on, we
|
||||
want its recipients to know that what they have is not the original, so
|
||||
that any problems introduced by others will not reflect on the original
|
||||
authors' reputations.
|
||||
|
||||
Finally, any free program is threatened constantly by software
|
||||
patents. We wish to avoid the danger that redistributors of a free
|
||||
program will individually obtain patent licenses, in effect making the
|
||||
program proprietary. To prevent this, we have made it clear that any
|
||||
patent must be licensed for everyone's free use or not licensed at all.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
|
||||
0. This License applies to any program or other work which contains
|
||||
a notice placed by the copyright holder saying it may be distributed
|
||||
under the terms of this General Public License. The "Program", below,
|
||||
refers to any such program or work, and a "work based on the Program"
|
||||
means either the Program or any derivative work under copyright law:
|
||||
that is to say, a work containing the Program or a portion of it,
|
||||
either verbatim or with modifications and/or translated into another
|
||||
language. (Hereinafter, translation is included without limitation in
|
||||
the term "modification".) Each licensee is addressed as "you".
|
||||
|
||||
Activities other than copying, distribution and modification are not
|
||||
covered by this License; they are outside its scope. The act of
|
||||
running the Program is not restricted, and the output from the Program
|
||||
is covered only if its contents constitute a work based on the
|
||||
Program (independent of having been made by running the Program).
|
||||
Whether that is true depends on what the Program does.
|
||||
|
||||
1. You may copy and distribute verbatim copies of the Program's
|
||||
source code as you receive it, in any medium, provided that you
|
||||
conspicuously and appropriately publish on each copy an appropriate
|
||||
copyright notice and disclaimer of warranty; keep intact all the
|
||||
notices that refer to this License and to the absence of any warranty;
|
||||
and give any other recipients of the Program a copy of this License
|
||||
along with the Program.
|
||||
|
||||
You may charge a fee for the physical act of transferring a copy, and
|
||||
you may at your option offer warranty protection in exchange for a fee.
|
||||
|
||||
2. You may modify your copy or copies of the Program or any portion
|
||||
of it, thus forming a work based on the Program, and copy and
|
||||
distribute such modifications or work under the terms of Section 1
|
||||
above, provided that you also meet all of these conditions:
|
||||
|
||||
a) You must cause the modified files to carry prominent notices
|
||||
stating that you changed the files and the date of any change.
|
||||
|
||||
b) You must cause any work that you distribute or publish, that in
|
||||
whole or in part contains or is derived from the Program or any
|
||||
part thereof, to be licensed as a whole at no charge to all third
|
||||
parties under the terms of this License.
|
||||
|
||||
c) If the modified program normally reads commands interactively
|
||||
when run, you must cause it, when started running for such
|
||||
interactive use in the most ordinary way, to print or display an
|
||||
announcement including an appropriate copyright notice and a
|
||||
notice that there is no warranty (or else, saying that you provide
|
||||
a warranty) and that users may redistribute the program under
|
||||
these conditions, and telling the user how to view a copy of this
|
||||
License. (Exception: if the Program itself is interactive but
|
||||
does not normally print such an announcement, your work based on
|
||||
the Program is not required to print an announcement.)
|
||||
|
||||
These requirements apply to the modified work as a whole. If
|
||||
identifiable sections of that work are not derived from the Program,
|
||||
and can be reasonably considered independent and separate works in
|
||||
themselves, then this License, and its terms, do not apply to those
|
||||
sections when you distribute them as separate works. But when you
|
||||
distribute the same sections as part of a whole which is a work based
|
||||
on the Program, the distribution of the whole must be on the terms of
|
||||
this License, whose permissions for other licensees extend to the
|
||||
entire whole, and thus to each and every part regardless of who wrote it.
|
||||
|
||||
Thus, it is not the intent of this section to claim rights or contest
|
||||
your rights to work written entirely by you; rather, the intent is to
|
||||
exercise the right to control the distribution of derivative or
|
||||
collective works based on the Program.
|
||||
|
||||
In addition, mere aggregation of another work not based on the Program
|
||||
with the Program (or with a work based on the Program) on a volume of
|
||||
a storage or distribution medium does not bring the other work under
|
||||
the scope of this License.
|
||||
|
||||
3. You may copy and distribute the Program (or a work based on it,
|
||||
under Section 2) in object code or executable form under the terms of
|
||||
Sections 1 and 2 above provided that you also do one of the following:
|
||||
|
||||
a) Accompany it with the complete corresponding machine-readable
|
||||
source code, which must be distributed under the terms of Sections
|
||||
1 and 2 above on a medium customarily used for software interchange; or,
|
||||
|
||||
b) Accompany it with a written offer, valid for at least three
|
||||
years, to give any third party, for a charge no more than your
|
||||
cost of physically performing source distribution, a complete
|
||||
machine-readable copy of the corresponding source code, to be
|
||||
distributed under the terms of Sections 1 and 2 above on a medium
|
||||
customarily used for software interchange; or,
|
||||
|
||||
c) Accompany it with the information you received as to the offer
|
||||
to distribute corresponding source code. (This alternative is
|
||||
allowed only for noncommercial distribution and only if you
|
||||
received the program in object code or executable form with such
|
||||
an offer, in accord with Subsection b above.)
|
||||
|
||||
The source code for a work means the preferred form of the work for
|
||||
making modifications to it. For an executable work, complete source
|
||||
code means all the source code for all modules it contains, plus any
|
||||
associated interface definition files, plus the scripts used to
|
||||
control compilation and installation of the executable. However, as a
|
||||
special exception, the source code distributed need not include
|
||||
anything that is normally distributed (in either source or binary
|
||||
form) with the major components (compiler, kernel, and so on) of the
|
||||
operating system on which the executable runs, unless that component
|
||||
itself accompanies the executable.
|
||||
|
||||
If distribution of executable or object code is made by offering
|
||||
access to copy from a designated place, then offering equivalent
|
||||
access to copy the source code from the same place counts as
|
||||
distribution of the source code, even though third parties are not
|
||||
compelled to copy the source along with the object code.
|
||||
|
||||
4. You may not copy, modify, sublicense, or distribute the Program
|
||||
except as expressly provided under this License. Any attempt
|
||||
otherwise to copy, modify, sublicense or distribute the Program is
|
||||
void, and will automatically terminate your rights under this License.
|
||||
However, parties who have received copies, or rights, from you under
|
||||
this License will not have their licenses terminated so long as such
|
||||
parties remain in full compliance.
|
||||
|
||||
5. You are not required to accept this License, since you have not
|
||||
signed it. However, nothing else grants you permission to modify or
|
||||
distribute the Program or its derivative works. These actions are
|
||||
prohibited by law if you do not accept this License. Therefore, by
|
||||
modifying or distributing the Program (or any work based on the
|
||||
Program), you indicate your acceptance of this License to do so, and
|
||||
all its terms and conditions for copying, distributing or modifying
|
||||
the Program or works based on it.
|
||||
|
||||
6. Each time you redistribute the Program (or any work based on the
|
||||
Program), the recipient automatically receives a license from the
|
||||
original licensor to copy, distribute or modify the Program subject to
|
||||
these terms and conditions. You may not impose any further
|
||||
restrictions on the recipients' exercise of the rights granted herein.
|
||||
You are not responsible for enforcing compliance by third parties to
|
||||
this License.
|
||||
|
||||
7. If, as a consequence of a court judgment or allegation of patent
|
||||
infringement or for any other reason (not limited to patent issues),
|
||||
conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot
|
||||
distribute so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you
|
||||
may not distribute the Program at all. For example, if a patent
|
||||
license would not permit royalty-free redistribution of the Program by
|
||||
all those who receive copies directly or indirectly through you, then
|
||||
the only way you could satisfy both it and this License would be to
|
||||
refrain entirely from distribution of the Program.
|
||||
|
||||
If any portion of this section is held invalid or unenforceable under
|
||||
any particular circumstance, the balance of the section is intended to
|
||||
apply and the section as a whole is intended to apply in other
|
||||
circumstances.
|
||||
|
||||
It is not the purpose of this section to induce you to infringe any
|
||||
patents or other property right claims or to contest validity of any
|
||||
such claims; this section has the sole purpose of protecting the
|
||||
integrity of the free software distribution system, which is
|
||||
implemented by public license practices. Many people have made
|
||||
generous contributions to the wide range of software distributed
|
||||
through that system in reliance on consistent application of that
|
||||
system; it is up to the author/donor to decide if he or she is willing
|
||||
to distribute software through any other system and a licensee cannot
|
||||
impose that choice.
|
||||
|
||||
This section is intended to make thoroughly clear what is believed to
|
||||
be a consequence of the rest of this License.
|
||||
|
||||
8. If the distribution and/or use of the Program is restricted in
|
||||
certain countries either by patents or by copyrighted interfaces, the
|
||||
original copyright holder who places the Program under this License
|
||||
may add an explicit geographical distribution limitation excluding
|
||||
those countries, so that distribution is permitted only in or among
|
||||
countries not thus excluded. In such case, this License incorporates
|
||||
the limitation as if written in the body of this License.
|
||||
|
||||
9. The Free Software Foundation may publish revised and/or new versions
|
||||
of the General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the Program
|
||||
specifies a version number of this License which applies to it and "any
|
||||
later version", you have the option of following the terms and conditions
|
||||
either of that version or of any later version published by the Free
|
||||
Software Foundation. If the Program does not specify a version number of
|
||||
this License, you may choose any version ever published by the Free Software
|
||||
Foundation.
|
||||
|
||||
10. If you wish to incorporate parts of the Program into other free
|
||||
programs whose distribution conditions are different, write to the author
|
||||
to ask for permission. For software which is copyrighted by the Free
|
||||
Software Foundation, write to the Free Software Foundation; we sometimes
|
||||
make exceptions for this. Our decision will be guided by the two goals
|
||||
of preserving the free status of all derivatives of our free software and
|
||||
of promoting the sharing and reuse of software generally.
|
||||
|
||||
NO WARRANTY
|
||||
|
||||
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
||||
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
||||
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
|
||||
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
|
||||
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
|
||||
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
|
||||
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
|
||||
REPAIR OR CORRECTION.
|
||||
|
||||
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
||||
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
|
||||
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
|
||||
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
|
||||
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
||||
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
||||
POSSIBILITY OF SUCH DAMAGES.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
convey the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program is interactive, make it output a short notice like this
|
||||
when it starts in an interactive mode:
|
||||
|
||||
Gnomovision version 69, Copyright (C) year name of author
|
||||
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, the commands you use may
|
||||
be called something other than `show w' and `show c'; they could even be
|
||||
mouse-clicks or menu items--whatever suits your program.
|
||||
|
||||
You should also get your employer (if you work as a programmer) or your
|
||||
school, if any, to sign a "copyright disclaimer" for the program, if
|
||||
necessary. Here is a sample; alter the names:
|
||||
|
||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
||||
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
||||
|
||||
<signature of Ty Coon>, 1 April 1989
|
||||
Ty Coon, President of Vice
|
||||
|
||||
This General Public License does not permit incorporating your program into
|
||||
proprietary programs. If your program is a subroutine library, you may
|
||||
consider it more useful to permit linking proprietary applications with the
|
||||
library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License.
|
8
README
Normal file
8
README
Normal file
@ -0,0 +1,8 @@
|
||||
This project contains set of RPM packaging helpers to make the multilib fixes
|
||||
centralized at one place for whole distribution.
|
||||
|
||||
For more info have a look at:
|
||||
https://fedorahosted.org/fpc/ticket/312
|
||||
https://fedoraproject.org/wiki/PackagingDrafts/MultilibTricks
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=1286193
|
||||
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/F6YVSCNNFFFNEOQ4TN6BJOPJZ2KMPEOJ/
|
29
macros.ml
Normal file
29
macros.ml
Normal file
@ -0,0 +1,29 @@
|
||||
# Basic set of macros for 'multilib-fix' script.
|
||||
# Copyright (C) 2015 Red Hat, Inc.
|
||||
# Written by Pavel Raiskup <praiskup@redhat.com>
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
# License as published by the Free Software Foundation; either
|
||||
# version 2.1 of the License, or (at your option) any later version.
|
||||
#
|
||||
# This library is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
# Lesser General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Lesser General Public
|
||||
# License along with this library; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
|
||||
# Macro multilib_fix_c_header is expected to be called
|
||||
# from %install (usually after 'make install' call) like:
|
||||
# %multilib_fix_c_header --file %{_includedir}/broken-header.h
|
||||
%multilib_fix_c_header @ML_FIX@ --buildroot "$RPM_BUILD_ROOT"
|
||||
|
||||
# Expands to 'true' if the actual architecture should take care to make
|
||||
# the package multilib-clean. Otherwise expands to 'false'.
|
||||
# Typically you can use this macro like:
|
||||
# %multilib_capable && { do_some_multilib_workarounds ; }
|
||||
%multilib_capable %{expand:%(@ML_INFO@ --multilib-capable)}
|
169
multilib-fix
Executable file
169
multilib-fix
Executable file
@ -0,0 +1,169 @@
|
||||
#! /bin/sh
|
||||
|
||||
# Fix multilib issue for header files.
|
||||
# Copyright (C) 2015-2016 Red Hat, Inc.
|
||||
# Written by Pavel Raiskup <praiskup@redhat.com>
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License along
|
||||
# with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
|
||||
|
||||
# Replace the multilib-unclean file with multilib-clean stub, while the
|
||||
# original file is moved to unique architecture-specific location.
|
||||
|
||||
@LIB@
|
||||
|
||||
opt_buildroot=$(pwd)
|
||||
opt_field_separator=-
|
||||
|
||||
# TODO: we could pretty easily implement other then 'cpp-header' stubs, if the
|
||||
# target file type allows some kind of "transparent" file inclusion. For
|
||||
# example shell scripts might use '. "${destdir}/${filename}_x86_64.sh'.
|
||||
# The solution is taken from Fedora PostgreSQL RPM package.
|
||||
print_stub ()
|
||||
{
|
||||
# The '#else' branch here is not needed! We never install this header on
|
||||
# systems where this set of '#ifdef's is not enough (adding suggested e.g.
|
||||
# in rhbz#1242873).
|
||||
|
||||
# TODO: Shorten the #ifdef hell. There's no need to have e.g. ifdef for
|
||||
# x86_64 in ppc64's wrapper.
|
||||
|
||||
replacement=$filename$opt_field_separator
|
||||
cat <<EOF
|
||||
/*
|
||||
* Kluge to support multilib installation of both 32- and 64-bit RPMS:
|
||||
* we need to arrange that header files that appear in both RPMs are
|
||||
* identical. Hence, this file is architecture-independent and calls
|
||||
* in an arch-dependent file that will appear in just one RPM.
|
||||
*
|
||||
* To avoid breaking arches not explicitly supported by Red Hat, we
|
||||
* use this indirection file *only* on known multilib arches.
|
||||
*
|
||||
* We pay attention to include _only_ the original multilib-unclean
|
||||
* header file. Including any other system-header file could cause
|
||||
* unpredictable include-ordering issues (rhbz#1412274, comment #16).
|
||||
*
|
||||
* Note: this may well fail if user tries to use gcc's -I- option.
|
||||
* But that option is deprecated anyway.
|
||||
*/
|
||||
#if defined(__x86_64__)
|
||||
#include "${replacement}x86_64.h"
|
||||
#elif defined(__i386__)
|
||||
#include "${replacement}i386.h"
|
||||
#elif defined(__ppc64__) || defined(__powerpc64__)
|
||||
#include "${replacement}ppc64.h"
|
||||
#elif defined(__ppc__) || defined(__powerpc__)
|
||||
#include "${replacement}ppc.h"
|
||||
#elif defined(__s390x__)
|
||||
#include "${replacement}s390x.h"
|
||||
#elif defined(__s390__)
|
||||
#include "${replacement}s390.h"
|
||||
#elif defined(__sparc__) && defined(__arch64__)
|
||||
#include "${replacement}sparc64.h"
|
||||
#elif defined(__sparc__)
|
||||
#include "${replacement}sparc.h"
|
||||
#endif
|
||||
EOF
|
||||
}
|
||||
|
||||
print_help ()
|
||||
{
|
||||
_h_exit=false
|
||||
test -n "$1" && _h_exit=:
|
||||
|
||||
cat <<EOF
|
||||
Usage: $progname [OPTIONS]
|
||||
|
||||
Replace the multilib-unclean header file with multilib-clean stub, while the
|
||||
original file is moved to unique architecture-specific location. This should be
|
||||
absolutely safe operation (effects of '#include <HEADER.h>' are unchanged.
|
||||
|
||||
To allow us to do incompatible changes in this script, packagers should use this
|
||||
script only through available RPM macros.
|
||||
|
||||
--buildroot prefix (directory where we play with installed files, usually
|
||||
after 'make install DESTDIR=buildroot')
|
||||
--file for example /some/path/test.h
|
||||
--field-separator by default we move filename.h to filename<SEP><ARCH>.h; this
|
||||
option allows you to override the <SEP> part
|
||||
--verbose print some useful information
|
||||
--arch override arch detection (mostly for testing purposes)
|
||||
--help show this help
|
||||
EOF
|
||||
|
||||
$_h_exit && exit "$1"
|
||||
}
|
||||
|
||||
while test $# -gt 0
|
||||
do
|
||||
_opt=$1 ; shift
|
||||
case $_opt in
|
||||
--buildroot|--arch|--file|--field-separator)
|
||||
_raw_opt=$(echo "$_opt" | sed -e 's/^--//' -e 's/-/_/g')
|
||||
eval "opt_$_raw_opt=\$1"
|
||||
shift || die "$_opt requires argument"
|
||||
;;
|
||||
--help)
|
||||
print_help 0
|
||||
;;
|
||||
*)
|
||||
error "unexpected '$_opt' program argument"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
$error_occurred && print_help 1
|
||||
fix_arch opt_arch
|
||||
|
||||
for i in arch buildroot file
|
||||
do
|
||||
eval "test -z \"\$opt_$i\"" && error "--$i needs to be set"
|
||||
done
|
||||
$error_occurred && print_help 1
|
||||
|
||||
# --> /buildroot/usr/include/test.h
|
||||
original_file="$opt_buildroot$opt_file"
|
||||
|
||||
# --> /buildroot/usr/include
|
||||
destdir=$(dirname "$original_file")
|
||||
|
||||
# --> test.h
|
||||
orig_basename=$(basename "$original_file")
|
||||
|
||||
# --> test
|
||||
filename=${orig_basename%%.[a-zA-Z0-9_]}
|
||||
|
||||
# --> .h
|
||||
suffix=${orig_basename##${filename}}
|
||||
|
||||
# --> ../test_x86_64.h (on x86_64)
|
||||
multilib_file="$destdir/$filename$opt_field_separator$opt_arch$suffix"
|
||||
|
||||
test -f "$original_file" || die "can't find '$original_file'"
|
||||
|
||||
is_multilib "$opt_arch" || {
|
||||
verbose "we don't need multilib haeder hack for '$opt_arch' architecture (no-op)"
|
||||
exit 0
|
||||
}
|
||||
|
||||
verbose "moving: '$original_file' to '$multilib_file'"
|
||||
|
||||
mv "$original_file" "$multilib_file" || exit 1
|
||||
if print_stub > "$original_file" && chmod 644 "$original_file"; then
|
||||
:
|
||||
else
|
||||
die "can't write into '$original_file'"
|
||||
fi
|
||||
|
||||
:
|
75
multilib-info
Executable file
75
multilib-info
Executable file
@ -0,0 +1,75 @@
|
||||
#! /bin/sh
|
||||
|
||||
# Probe system for multilib information.
|
||||
# Copyright (C) 2016 Red Hat, Inc.
|
||||
# Written by Pavel Raiskup <praiskup@redhat.com>
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License along
|
||||
# with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
|
||||
@LIB@
|
||||
|
||||
opt_multilib_capable=false
|
||||
|
||||
print_help ()
|
||||
{
|
||||
_h_exit=false
|
||||
test -n "$1" && _h_exit=:
|
||||
|
||||
cat <<EOF
|
||||
Usage: $progname [OPTIONS]
|
||||
|
||||
Probe system for interesting multilib information.
|
||||
|
||||
--multilib-capable could package built on this box play some role on multilib
|
||||
capable system? Prints 'true' or 'false'.
|
||||
--arch override arch detection (mostly for testing purposes)
|
||||
EOF
|
||||
$_h_exit && exit "$1"
|
||||
}
|
||||
|
||||
while test $# -gt 0
|
||||
do
|
||||
_opt=$1 ; shift
|
||||
case $_opt in
|
||||
--arch)
|
||||
_raw_opt=$(echo "$_opt" | sed -e 's/^--//' -e 's/-/_/g')
|
||||
eval "opt_$_raw_opt=\$1"
|
||||
shift || die "$_opt requires argument"
|
||||
;;
|
||||
--multilib-capable)
|
||||
_raw_opt=$(echo "$_opt" | sed -e 's/^--//' -e 's/-/_/g')
|
||||
eval "opt_$_raw_opt=:"
|
||||
;;
|
||||
--help)
|
||||
print_help 0
|
||||
;;
|
||||
*)
|
||||
error "unexpected '$_opt' program argument"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
$error_occurred && print_help 1
|
||||
fix_arch opt_arch
|
||||
|
||||
$opt_multilib_capable && {
|
||||
if is_multilib "$opt_arch"; then
|
||||
echo true
|
||||
else
|
||||
echo false
|
||||
fi
|
||||
exit 0
|
||||
}
|
||||
|
||||
print_help 1
|
55
multilib-library
Normal file
55
multilib-library
Normal file
@ -0,0 +1,55 @@
|
||||
progname=$(basename "$0")
|
||||
opt_verbose=:
|
||||
opt_arch=$(uname -i)
|
||||
|
||||
multilib_arches="
|
||||
i386 x86_64
|
||||
ppc ppc64
|
||||
s390 s390x
|
||||
sparc sparc64
|
||||
"
|
||||
|
||||
verbose ()
|
||||
{
|
||||
$opt_verbose && echo >&2 "INFO: $progname: $*"
|
||||
}
|
||||
|
||||
die ()
|
||||
{
|
||||
echo >&2 " # $*"
|
||||
print_help 1
|
||||
}
|
||||
|
||||
error ()
|
||||
{
|
||||
error_occurred=:
|
||||
echo >&2 " ! $*"
|
||||
}
|
||||
|
||||
is_multilib ()
|
||||
{
|
||||
_m_result=false
|
||||
for _m_arch in $multilib_arches
|
||||
do
|
||||
if test "$_m_arch" = "$1"; then
|
||||
_m_result=:
|
||||
break
|
||||
fi
|
||||
done
|
||||
$_m_result
|
||||
}
|
||||
|
||||
fix_arch ()
|
||||
{
|
||||
eval "_arch=\$$1"
|
||||
case $_arch in
|
||||
# See rhbz#1242873 for more info.
|
||||
ppc64p7)
|
||||
eval "$1=ppc64"
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
error_occurred=false
|
||||
|
||||
# vi: ft=sh
|
170
multilib-rpm-config.spec
Normal file
170
multilib-rpm-config.spec
Normal file
@ -0,0 +1,170 @@
|
||||
# https://fedoraproject.org/wiki/Packaging:Guidelines#Packaging_of_Additional_RPM_Macros
|
||||
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
|
||||
|
||||
%global rrcdir %_libexecdir
|
||||
|
||||
Summary: Multilib packaging helpers
|
||||
Name: multilib-rpm-config
|
||||
Version: 1
|
||||
Release: 16%{?dist}
|
||||
License: GPLv2+
|
||||
|
||||
# TODO: resolve directly in rpm/redhat-rpm-config (instead of this hack).
|
||||
# Note that to avoid FTBFS against plain RHEL6, we can't put this hack before
|
||||
# License tag.
|
||||
%{!?_licensedir:%global license %%doc}
|
||||
|
||||
URL: https://fedoraproject.org/wiki/PackagingDrafts/MultilibTricks
|
||||
|
||||
BuildRequires: gcc
|
||||
|
||||
Source0: multilib-fix
|
||||
Source1: macros.ml
|
||||
Source2: README
|
||||
Source3: COPYING
|
||||
Source4: multilib-library
|
||||
Source5: multilib-info
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
# Most probably we want to move everything here?
|
||||
Requires: redhat-rpm-config
|
||||
|
||||
%description
|
||||
Set of tools (shell scripts, RPM macro files) to help with multilib packaging
|
||||
issues.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -c -T
|
||||
install -m 644 %{SOURCE2} %{SOURCE3} .
|
||||
|
||||
|
||||
%build
|
||||
%global ml_fix %rrcdir/multilib-fix
|
||||
%global ml_info %rrcdir/multilib-info
|
||||
|
||||
lib_sed_pattern='/@LIB@/ {
|
||||
r %{SOURCE4}
|
||||
d
|
||||
}'
|
||||
|
||||
sed -e 's|@ML_FIX@|%ml_fix|g' \
|
||||
-e 's|@ML_INFO@|%ml_info|g' \
|
||||
%{SOURCE1} > macros.multilib
|
||||
sed -e "$lib_sed_pattern" \
|
||||
%{SOURCE0} > multilib-fix
|
||||
sed -e "$lib_sed_pattern" \
|
||||
%{SOURCE5} > multilib-info
|
||||
|
||||
|
||||
%install
|
||||
mkdir -p %{buildroot}%{rrcdir}
|
||||
mkdir -p %{buildroot}%{macrosdir}
|
||||
install -m 644 -p macros.multilib %{buildroot}/%{macrosdir}
|
||||
install -m 755 -p multilib-fix %{buildroot}/%{ml_fix}
|
||||
install -m 755 -p multilib-info %{buildroot}/%{ml_info}
|
||||
|
||||
|
||||
%check
|
||||
mkdir tests ; cd tests
|
||||
ml_fix="sh `pwd`/../multilib-fix --buildroot `pwd`"
|
||||
capable="sh `pwd`/../multilib-info --multilib-capable"
|
||||
|
||||
mkdir template
|
||||
cat > template/main.c <<EOF
|
||||
#include "header.h"
|
||||
int main () { call (); return 0; }
|
||||
EOF
|
||||
cat > template/header.h <<EOF
|
||||
#include <stdio.h>
|
||||
void call (void) { printf ("works!\n"); }
|
||||
EOF
|
||||
|
||||
cp -r template basic
|
||||
gcc ./basic/main.c
|
||||
./a.out
|
||||
|
||||
pwd
|
||||
if `$capable`; then
|
||||
cp -r template really-works
|
||||
$ml_fix --file /really-works/header.h
|
||||
gcc really-works/main.c
|
||||
./a.out
|
||||
test -f really-works/header-*.h
|
||||
fi
|
||||
|
||||
cp -r template other_arch
|
||||
$ml_fix --file /other_arch/header.h --arch ppc64
|
||||
test -f other_arch/header-*.h
|
||||
|
||||
cp -r template other_arch_fix
|
||||
$ml_fix --file /other_arch_fix/header.h --arch ppc64p7
|
||||
test -f other_arch_fix/header-ppc64.h
|
||||
|
||||
cp -r template aarch64-no-change
|
||||
$ml_fix --file /aarch64-no-change/header.h --arch aarch64
|
||||
test ! -f aarch64-no-change/header-*.h
|
||||
|
||||
test `$capable --arch x86_64` = true
|
||||
test `$capable --arch aarch64` = false
|
||||
test `$capable --arch ppc64p7` = true
|
||||
|
||||
|
||||
%files
|
||||
%license COPYING
|
||||
%doc README
|
||||
%{rrcdir}/*
|
||||
%{macrosdir}/*
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1-16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1-15
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Thu Jun 14 2018 Honza Horak <hhorak@redhat.com> - 1-11
|
||||
- Add shebang to multilib-info
|
||||
|
||||
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Fri Apr 07 2017 Pavel Raiskup <praiskup@redhat.com> - 1-8
|
||||
- fix FTBFS on plain RHEL6
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Fri Jul 01 2016 Yaakov Selkowitz <yselkowi@redhat.com> - 1-6
|
||||
- Fix testsuite on non-multilib arches (#1352164)
|
||||
|
||||
* Wed Jun 22 2016 Pavel Raiskup <praiskup@redhat.com> - 1-5
|
||||
- document why there is no need for '#else' in the replacement header
|
||||
- add basic testsuite
|
||||
|
||||
* Mon Jun 13 2016 Pavel Raiskup <praiskup@redhat.com> - 1-4
|
||||
- use '-' as a field separator by default
|
||||
|
||||
* Thu Jun 09 2016 Pavel Raiskup <praiskup@redhat.com> - 1-3
|
||||
- package separately from redhat-rpm-config
|
||||
|
||||
* Fri Nov 27 2015 Pavel Raiskup <praiskup@redhat.com> - 1-2
|
||||
- fix licensing in Sources
|
||||
- allow undefined %%namespace
|
||||
|
||||
* Wed Nov 18 2015 Pavel Raiskup <praiskup@redhat.com> - 1-1
|
||||
- initial packaging
|
Loading…
Reference in New Issue
Block a user