Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
apk-tools
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Hassan Albahri
apk-tools
Commits
bcbe575c
Commit
bcbe575c
authored
14 years ago
by
Timo Teräs
Browse files
Options
Downloads
Patches
Plain Diff
build: fix CFLAGS, and use pkg-config for lua
parent
11925542
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/Makefile
+4
-5
4 additions, 5 deletions
src/Makefile
with
4 additions
and
5 deletions
src/Makefile
+
4
−
5
View file @
bcbe575c
PKGDEPS
:=
openssl zlib
PKGDEPS
:=
openssl zlib
lua
ifeq
($(shell pkg-config --print-errors --exists $(PKGDEPS) || echo fail),fail)
$(
error
Build dependencies are not met
)
...
...
@@ -11,14 +11,14 @@ libapk.so-objs := common.o state.o database.o package.o archive.o \
shlibs-y
+=
apk.so
apk.so-objs
:=
lua-apk.o
CFLAGS_lua-apk.o
:=
-DAPK_VERSION
=
\"
$(
FULL_VERSION
)
\"
LIBS_apk.so
:=
-L
$(
obj
)
-llua
-lapk
LIBS_apk.so
:=
-L
$(
obj
)
-lapk
progs-y
+=
apk
apk-objs
:=
apk.o add.o del.o fix.o update.o info.o
\
search.o upgrade.o cache.o ver.o index.o fetch.o
\
audit.o verify.o
CFLAGS
+=
-D_ATFILE_SOURCE
CFLAGS
_ALL
+=
-D_ATFILE_SOURCE
CFLAGS_apk.o
:=
-DAPK_VERSION
=
\"
$(
FULL_VERSION
)
\"
LIBS_apk
:=
-lapk
...
...
@@ -27,12 +27,11 @@ apk.static-objs := $(apk-objs)
LDFLAGS_apk.static
:=
-static
LDFLAGS_apk
+=
-nopie
-L
$(
obj
)
CFLAGS
+=
$(
shell pkg-config
--cflags
$(
PKGDEPS
))
CFLAGS
_ALL
+=
$(
shell pkg-config
--cflags
$(
PKGDEPS
))
LIBS
:=
-Wl
,--as-needed
\
$(
shell pkg-config
--libs
$(
PKGDEPS
))
\
-Wl
,--no-as-needed
$(obj)/apk
:
$(obj)/libapk.so
$(obj)/apk.so
:
$(obj)/libapk.so
...
...
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