Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Tom Niget
slapos
Commits
e358db46
Commit
e358db46
authored
Sep 21, 2016
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pkgconfig: removes popt dependency, which has been dropped since pkgconfig-0.27
parent
7e0d0216
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
5 deletions
+3
-5
component/pkgconfig/buildout.cfg
component/pkgconfig/buildout.cfg
+3
-5
No files found.
component/pkgconfig/buildout.cfg
View file @
e358db46
...
@@ -7,7 +7,6 @@ parts =
...
@@ -7,7 +7,6 @@ parts =
extends =
extends =
../gettext/buildout.cfg
../gettext/buildout.cfg
../glib/buildout.cfg
../glib/buildout.cfg
../popt/buildout.cfg
[pkg-config]
[pkg-config]
<= pkgconfig
<= pkgconfig
...
@@ -20,15 +19,14 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
...
@@ -20,15 +19,14 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
# build pkg-config twice so that second configure can use pkg-config
# build pkg-config twice so that second configure can use pkg-config
# to compute GLIB_CFLAGS and GLIB_LIBS.
# to compute GLIB_CFLAGS and GLIB_LIBS.
pre-configure =
pre-configure =
./configure --prefix=${:location} --with-installed-glib
--with-installed-popt
&& make
./configure --prefix=${:location} --with-installed-glib && make
configure-options =
configure-options =
--with-installed-glib
--with-installed-glib
--with-installed-popt
--disable-host-tool
--disable-host-tool
environment =
environment =
PATH=.:%(PATH)s
PATH=.:%(PATH)s
PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig
PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig
CPPFLAGS=-I${glib:location}/include
-I${popt:location}/include
CPPFLAGS=-I${glib:location}/include
LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib
-L${popt:location}/lib -Wl,-rpath=${popt:location}/lib
LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib
GLIB_CFLAGS=-I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include
GLIB_CFLAGS=-I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include
GLIB_LIBS=-L${glib:location}/lib -lglib-2.0 -lintl
GLIB_LIBS=-L${glib:location}/lib -lglib-2.0 -lintl
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