Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
steam-runtime-tools
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
steamrt
steam-runtime-tools
Commits
6d4cf82e
Commit
6d4cf82e
authored
7 years ago
by
Vivek Das Mohapatra
Browse files
Options
Downloads
Patches
Plain Diff
Fix missing target major-version soname component in project setup
Conflicts: data/capsule-shim.mk.in
parent
359bc123
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!311
Build capsule-capture-libs from a bundled copy of libcapsule
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
data/capsule-init-project
+5
-0
5 additions, 0 deletions
data/capsule-init-project
data/capsule-shim.mk.in
+2
-2
2 additions, 2 deletions
data/capsule-shim.mk.in
with
7 additions
and
2 deletions
data/capsule-init-project
+
5
−
0
View file @
6d4cf82e
...
@@ -72,12 +72,15 @@ lcbase=${base,,};
...
@@ -72,12 +72,15 @@ lcbase=${base,,};
dest
=
${
3
:-
$base
-proxy
}
;
dest
=
${
3
:-
$base
-proxy
}
;
ver
=
0
;
ver
=
0
;
maj
=
0
;
:
"
${
CAPSULE_SYMBOLS
:
=
"
$libexec
/capsule-symbols"
}
"
:
"
${
CAPSULE_SYMBOLS
:
=
"
$libexec
/capsule-symbols"
}
"
:
"
${
CAPSULE_VERSION
:
=
"
$libexec
/capsule-version"
}
"
:
"
${
CAPSULE_VERSION
:
=
"
$libexec
/capsule-version"
}
"
read
x x ver x < <
(
"
$CAPSULE_VERSION
"
"
$target
"
"
$tree
"
)
;
read
x x ver x < <
(
"
$CAPSULE_VERSION
"
"
$target
"
"
$tree
"
)
;
maj
=
${
ver
%%.*
}
;
echo
Generating project
for
$tree
:
$target
$ver
proxy
;
echo
Generating project
for
$tree
:
$target
$ver
proxy
;
echo
Creating project directory
$dest
;
echo
Creating project directory
$dest
;
...
@@ -153,6 +156,7 @@ AC_CONFIG_MACRO_DIR([m4])
...
@@ -153,6 +156,7 @@ AC_CONFIG_MACRO_DIR([m4])
dnl basename of the main library we are proxying for:
dnl basename of the main library we are proxying for:
AC_SUBST([LIB],[
$name
])
AC_SUBST([LIB],[
$name
])
AC_SUBST([MAJ],[
$maj
])
dnl don't kvetch about gnu makefile syntax
dnl don't kvetch about gnu makefile syntax
dnl and don't require ChangeLog &co if they don't exist
dnl and don't require ChangeLog &co if they don't exist
...
@@ -173,6 +177,7 @@ cat - <<EOF > Makefile.am
...
@@ -173,6 +177,7 @@ cat - <<EOF > Makefile.am
CAPSULE_LIBRARY :=
$name
CAPSULE_LIBRARY :=
$name
CAPSULE_VERSION :=
$ver
CAPSULE_VERSION :=
$ver
CAPSULE_TREE :=
$tree
CAPSULE_TREE :=
$tree
CAPSULE_MAJOR :=
$maj
include @CAPSULE_MKINC@/disabled.mk
include @CAPSULE_MKINC@/disabled.mk
##include capsule-shim.mk##
##include capsule-shim.mk##
...
...
This diff is collapsed.
Click to expand it.
data/capsule-shim.mk.in
+
2
−
2
View file @
6d4cf82e
...
@@ -34,8 +34,8 @@ shim/lib%.so.c: shim/lib%.so.c.excluded shim/lib%.so.c.dlopen shim/lib%.so.c.dls
...
@@ -34,8 +34,8 @@ shim/lib%.so.c: shim/lib%.so.c.excluded shim/lib%.so.c.dlopen shim/lib%.so.c.dls
# regenerate the exportable symbols list
# regenerate the exportable symbols list
shim/lib%.so.symbols: shim/lib%.so.c.shared
shim/lib%.so.symbols: shim/lib%.so.c.shared
$(AM_V_GEN)(ht=$(CAPSULE_TREE); \
$(AM_V_GEN)(ht=$(CAPSULE_TREE);
\
(for dso in lib@LIB@.so $$(cat $<); \
(for dso in lib@LIB@.so
.@MAJ@
$$(cat $<); \
do $(libexecd)/capsule-symbols $$dso $${ht:-/host}; done > $@.tmp) && \
do $(libexecd)/capsule-symbols $$dso $${ht:-/host}; done > $@.tmp) && \
mv $@.tmp $@)
mv $@.tmp $@)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment