|
[-]
[+]
|
Changed |
_service:tar_git:libglibutil.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:libglibutil.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -6,7 +6,7 @@
<service name="tar_git">
<param name="url">https://git.sailfishos.org/mer-core/libglibutil.git</param>
<param name="branch">master</param>
- <param name="revision">e8f82c19782c0d6af0ee5cbec64c13c3d45c53e4</param>
+ <param name="revision">549849d098507050b158095bd18b4b7046a46358</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Deleted |
_service:tar_git:libglibutil-1.0.44.tar.bz2/debian/libglibutil-dev.install
^
|
| @@ -1,3 +0,0 @@
-debian/tmp/usr/lib/libglibutil.so usr/lib
-include/*.h usr/include/gutil
-build/libglibutil.pc usr/lib/pkgconfig
|
|
[-]
[+]
|
Deleted |
_service:tar_git:libglibutil-1.0.44.tar.bz2/debian/libglibutil.install
^
|
| @@ -1 +0,0 @@
-debian/tmp/usr/lib/libglibutil.so.* usr/lib
|
|
[-]
[+]
|
Changed |
_service:tar_git:libglibutil-1.0.46.tar.bz2/.gitignore
^
|
| @@ -6,9 +6,11 @@
test/coverage/results
debian/files
debian/libglibutil-dev.debhelper.log
+debian/libglibutil-dev.install
debian/libglibutil-dev.substvars
debian/libglibutil-dev
debian/libglibutil.debhelper.log
+debian/libglibutil.install
debian/libglibutil.postinst.debhelper
debian/libglibutil.postrm.debhelper
debian/libglibutil.substvars
|
|
[-]
[+]
|
Changed |
_service:tar_git:libglibutil-1.0.46.tar.bz2/Makefile
^
|
| @@ -20,7 +20,7 @@
VERSION_MAJOR = 1
VERSION_MINOR = 0
-VERSION_RELEASE = 44
+VERSION_RELEASE = 46
# Version for pkg-config
PCVERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE)
@@ -70,10 +70,8 @@
# Tools and flags
#
-ifndef CC
-CC = $(CROSS_COMPILE)gcc
-endif
-
+CC ?= $(CROSS_COMPILE)gcc
+STRIP ?= strip
LD = $(CC)
WARNINGS = -Wall
INCLUDES = -I$(INCLUDE_DIR)
@@ -86,10 +84,7 @@
RELEASE_FLAGS =
COVERAGE_FLAGS = -g
-ifndef KEEP_SYMBOLS
-KEEP_SYMBOLS = 0
-endif
-
+KEEP_SYMBOLS ?= 0
ifneq ($(KEEP_SYMBOLS),0)
RELEASE_FLAGS += -g
endif
@@ -164,6 +159,7 @@
rm -fr debian/tmp debian/libglibutil debian/libglibutil-dev
rm -f documentation.list debian/files debian/*.substvars
rm -f debian/*.debhelper.log debian/*.debhelper debian/*~
+ rm -fr debian/*.install
test:
make -C test test
@@ -197,7 +193,7 @@
$(LD) $(RELEASE_OBJS) $(RELEASE_LDFLAGS) -o $@
ln -sf $(LIB) $(RELEASE_LINK)
ifeq ($(KEEP_SYMBOLS),0)
- strip $@
+ $(STRIP) $@
endif
$(DEBUG_LINK):
@@ -221,8 +217,19 @@
$(COVERAGE_STATIC_LIB): $(COVERAGE_OBJS)
$(AR) rc $@ $?
-$(PKGCONFIG): $(LIB_NAME).pc.in
- sed -e 's/\[version\]/'$(PCVERSION)/g $< > $@
+#
+# LIBDIR usually gets substituted with arch specific dir.
+# It's relative in deb build and can be whatever in rpm build.
+#
+
+LIBDIR ?= usr/lib
+ABS_LIBDIR := $(shell echo /$(LIBDIR) | sed -r 's|/+|/|g')
+
+$(PKGCONFIG): $(LIB_NAME).pc.in Makefile
+ sed -e 's|@version@|$(PCVERSION)|g' -e 's|@libdir@|$(ABS_LIBDIR)|g' $< > $@
+
+debian/%.install: debian/%.install.in
+ sed 's|@LIBDIR@|$(LIBDIR)|g' $< > $@
#
# Install
@@ -234,9 +241,9 @@
INSTALL_DIRS = $(INSTALL) -d
INSTALL_FILES = $(INSTALL) -m $(INSTALL_PERM)
-INSTALL_LIB_DIR = $(DESTDIR)/usr/lib
+INSTALL_LIB_DIR = $(DESTDIR)$(ABS_LIBDIR)
INSTALL_INCLUDE_DIR = $(DESTDIR)/usr/include/gutil
-INSTALL_PKGCONFIG_DIR = $(DESTDIR)/usr/lib/pkgconfig
+INSTALL_PKGCONFIG_DIR = $(DESTDIR)$(ABS_LIBDIR)/pkgconfig
install: $(INSTALL_LIB_DIR)
$(INSTALL_FILES) $(RELEASE_LIB) $(INSTALL_LIB_DIR)
|
|
[-]
[+]
|
Changed |
_service:tar_git:libglibutil-1.0.46.tar.bz2/debian/changelog
^
|
| @@ -1,3 +1,15 @@
+libglibutil (1.0.46) unstable; urgency=low
+
+ * Allow STRIP to be defined by the environment
+
+ -- Slava Monich <slava.monich@jolla.com> Sat, 30 May 2020 00:02:35 +0300
+
+libglibutil (1.0.45) unstable; urgency=low
+
+ * Support for multiple archs
+
+ -- Slava Monich <slava.monich@jolla.com> Fri, 22 May 2020 16:11:42 +0300
+
libglibutil (1.0.44) unstable; urgency=low
* Adapted to side-by-side linking
|
|
[-]
[+]
|
Changed |
_service:tar_git:libglibutil-1.0.46.tar.bz2/debian/control
^
|
| @@ -2,7 +2,7 @@
Section: libs
Priority: optional
Maintainer: Slava Monich <slava.monich@jolla.com>
-Build-Depends: debhelper (>= 7), libglib2.0-dev (>= 2.0)
+Build-Depends: debhelper (>= 8.1.3), libglib2.0-dev (>= 2.0)
Standards-Version: 3.8.4
Package: libglibutil
|
|
[-]
[+]
|
Added |
_service:tar_git:libglibutil-1.0.46.tar.bz2/debian/libglibutil-dev.install.in
^
|
| @@ -0,0 +1,3 @@
+debian/tmp/@LIBDIR@/libglibutil.so @LIBDIR@
+debian/tmp/@LIBDIR@/pkgconfig/libglibutil.pc @LIBDIR@/pkgconfig
+debian/tmp/usr/include/* usr/include/
|
|
[-]
[+]
|
Added |
_service:tar_git:libglibutil-1.0.46.tar.bz2/debian/libglibutil.install.in
^
|
| @@ -0,0 +1 @@
+debian/tmp/@LIBDIR@/libglibutil.so.* @LIBDIR@
|
|
[-]
[+]
|
Changed |
_service:tar_git:libglibutil-1.0.46.tar.bz2/debian/rules
^
|
| @@ -4,8 +4,13 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+LIBDIR=usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+override_dh_auto_build:
+ dh_auto_build -- LIBDIR=$(LIBDIR) release pkgconfig debian/libglibutil.install debian/libglibutil-dev.install
+
override_dh_auto_install:
- dh_auto_install -- install-dev
+ dh_auto_install -- LIBDIR=$(LIBDIR) install-dev
%:
dh $@
|
|
[-]
[+]
|
Changed |
_service:tar_git:libglibutil-1.0.46.tar.bz2/libglibutil.pc.in
^
|
| @@ -1,10 +1,10 @@
name=glibutil
-libdir=/usr/lib
+libdir=@libdir@
includedir=/usr/include
Name: libglibutil
Description: Library of glib utilities
-Version: [version]
+Version: @version@
Requires.private: glib-2.0
Libs: -L${libdir} -l${name}
Cflags: -I${includedir} -I${includedir}/gutil
|
