Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
eepm
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Vladislav
eepm
Commits
432c3ada
Commit
432c3ada
authored
Jul 15, 2023
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
epm repack common: implement add_unirequires and UNIREQUIRES support
parent
dbc43627
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
45 additions
and
0 deletions
+45
-0
common.sh
repack.d/common.sh
+21
-0
test_adduniqreqs.sh
tests/test_adduniqreqs.sh
+24
-0
No files found.
repack.d/common.sh
View file @
432c3ada
...
...
@@ -283,6 +283,25 @@ add_requires()
subst
"1iRequires:
$*
"
$SPEC
}
# libstdc++.so.6 -> libstdc++.so.6()(64bit)
add_unirequires
()
{
[
-n
"
$1
"
]
||
return
if
[
"
$(
epm print info
-b
)
"
=
"64"
]
;
then
local
req reqs
reqs
=
''
for
req
in
$*
;
do
reqs
=
"
$reqs
$req
"
echo
"
$req
"
|
grep
"^lib"
|
grep
-q
-v
-F
"(64bit)"
&&
reqs
=
"
$reqs
"
'()(64bit)'
done
subst
"1iRequires:
$reqs
"
$SPEC
else
echo
"
$*
"
|
grep
-F
"(64bit)"
&&
fatal
"Unsupported (64bit) on
$(
epm print info
-a
)
arch."
subst
"1iRequires:
$*
"
$SPEC
fi
}
install_requires
()
{
[
-n
"
$1
"
]
||
return
...
...
@@ -366,4 +385,6 @@ fi
[
-n
"
$PREINSTALL_PACKAGES
"
]
&&
install_requires
$PREINSTALL_PACKAGES
[
-n
"
$UNIREQUIRES
"
]
&&
add_unirequires
$UNIREQUIRES
true
tests/test_adduniqreqs.sh
0 → 100755
View file @
432c3ada
#!/bin/sh
subst
()
{
echo
"
$*
"
}
add_unirequires
()
{
[
-n
"
$1
"
]
||
return
if
[
"
$(
epm print info
-b
)
"
=
"64"
]
;
then
local
req reqs
reqs
=
''
for
req
in
$*
;
do
reqs
=
"
$reqs
$req
"
echo
"
$req
"
|
grep
"^lib"
|
grep
-q
-v
-F
"(64bit)"
&&
reqs
=
"
$reqs
"
'()(64bit)'
done
subst
"1iRequires:
$reqs
"
$SPEC
else
subst
"1iRequires:
$*
"
$SPEC
fi
}
add_unirequires
"libstdc++.so.6 libX11-xcb.so.1 libX11.so.6 libXau.so.6 libxcb.so.1 libXcursor.so.1 libXdmcp.so.6 libXext.so.6 libXfixes.so.3 libXrender.so.1"
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment