Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add thrift 0.13.0 #8307

Merged
merged 6 commits into from
Sep 1, 2021
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions rules/thrift_0_13_0.dep
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
SPATH := $($(LIBTHRIFT_0_13_0)_SRC_PATH)
DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/thrift_0_13_0.mk rules/thrift_0_13_0.dep
DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
DEP_FILES += $(shell git ls-files $(SPATH))

$(LIBTHRIFT_0_13_0)_CACHE_MODE := GIT_CONTENT_SHA
$(LIBTHRIFT_0_13_0)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
$(LIBTHRIFT_0_13_0)_DEP_FILES := $(DEP_FILES)
17 changes: 17 additions & 0 deletions rules/thrift_0_13_0.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# thrift package

THRIFT_VERSION_0_13_0 = 0.13.0
THRIFT_VERSION_0_13_0_FULL = $(THRIFT_VERSION_0_13_0)-6

LIBTHRIFT_0_13_0 = libthrift-$(THRIFT_VERSION_0_13_0)_$(THRIFT_VERSION_0_13_0_FULL)_$(CONFIGURED_ARCH).deb
$(LIBTHRIFT_0_13_0)_SRC_PATH = $(SRC_PATH)/thrift_0_13_0
SONIC_MAKE_DEBS += $(LIBTHRIFT_0_13_0)

LIBTHRIFT_DEV_0_13_0 = libthrift-dev_$(THRIFT_VERSION_0_13_0_FULL)_$(CONFIGURED_ARCH).deb
$(eval $(call add_derived_package,$(LIBTHRIFT_0_13_0),$(LIBTHRIFT_DEV_0_13_0)))

PYTHON3_THRIFT_0_13_0 = python3-thrift_$(THRIFT_VERSION_0_13_0_FULL)_$(CONFIGURED_ARCH).deb
$(eval $(call add_derived_package,$(LIBTHRIFT_0_13_0),$(PYTHON_THRIFT_0_13_0)))

THRIFT_COMPILER_0_13_0 = thrift-compiler_$(THRIFT_VERSION_0_13_0_FULL)_$(CONFIGURED_ARCH).deb
$(eval $(call add_derived_package,$(LIBTHRIFT_0_13_0),$(THRIFT_COMPILER_0_13_0)))
4 changes: 4 additions & 0 deletions src/thrift_0_13_0/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
*
!.gitignore
!Makefile
!patch/
32 changes: 32 additions & 0 deletions src/thrift_0_13_0/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
SHELL = /bin/bash
.ONESHELL:
.SHELLFLAGS += -e -x

THRIFT_VERSION = 0.13.0
THRIFT_VERSION_FULL = $(THRIFT_VERSION)-6

MAIN_TARGET = libthrift-$(THRIFT_VERSION)_$(THRIFT_VERSION_FULL)_$(CONFIGURED_ARCH).deb
msosyak marked this conversation as resolved.
Show resolved Hide resolved
DERIVED_TARGETS = libthrift-dev_$(THRIFT_VERSION_FULL)_$(CONFIGURED_ARCH).deb \
python3-thrift_$(THRIFT_VERSION_FULL)_$(CONFIGURED_ARCH).deb \
thrift-compiler_$(THRIFT_VERSION_FULL)_$(CONFIGURED_ARCH).deb

THRIFT_LINK_PRE = http://deb.debian.org/debian/pool/main/t/thrift/

$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
rm -rf thrift*

wget "$(THRIFT_LINK_PRE)/thrift_$(THRIFT_VERSION_FULL).debian.tar.xz"
msosyak marked this conversation as resolved.
Show resolved Hide resolved
wget "$(THRIFT_LINK_PRE)/thrift_$(THRIFT_VERSION).orig.tar.gz"
wget "$(THRIFT_LINK_PRE)/thrift_$(THRIFT_VERSION_FULL).dsc"

dpkg-source -x thrift_$(THRIFT_VERSION_FULL).dsc
pushd thrift-$(THRIFT_VERSION)

# Disable php perl and few other packages as they need additional packages to be installed
patch -p1 < ../patch/0001-Disable-unneeded-packages.patch
DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -d -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
msosyak marked this conversation as resolved.
Show resolved Hide resolved
popd

mv $(DERIVED_TARGETS) $* $(DEST)/

$(addprefix $(DEST)/, $(DERIVED_TARGETS)): $(DEST)/% : $(DEST)/$(MAIN_TARGET)
112 changes: 112 additions & 0 deletions src/thrift_0_13_0/patch/0001-Disable-unneeded-packages.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
From cfefc0c946c999838926298a01d84c2af1905be7 Mon Sep 17 00:00:00 2001
From: user <[email protected]>
Date: Tue, 10 Aug 2021 15:01:25 +0000
Subject: [PATCH] Disable-unneeded-packages

---
debian/control | 54 +++++++++++++++++++++++++-------------------------
debian/rules | 7 +++----
2 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/debian/control b/debian/control
index 5126e47..b0044da 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,8 @@ Build-Depends: debhelper-compat (= 11), dh-python,
python3-all-dev,
python3-six,
golang-go, golang-github-golang-mock-dev,
- pkg-php-tools (>= 1.14~), php-dev, phpunit, php-codesniffer,
- perl (>= 5.22), libbit-vector-perl, libclass-accessor-perl,
+# pkg-php-tools (>= 1.14~), php-dev, phpunit, php-codesniffer,
+# perl (>= 5.22), libbit-vector-perl, libclass-accessor-perl,
msosyak marked this conversation as resolved.
Show resolved Hide resolved
# openjdk-11-jdk, javahelper, maven-debian-helper (>= 1.5), ant (>= 1.7), ant-optional,
# libhttpclient-java, libslf4j-java, libservlet3.1-java (>= 8),
# nodejs, npm,
@@ -175,32 +175,32 @@ Description: Python library for Thrift (debug symbols)
# .
# This package contains Javadoc HTML documentation for libthrift-java .
#
-Package: php-thrift
-Architecture: any
-Section: php
-Depends: ${phpcomposer:Debian-require}, ${shlibs:Depends}, ${misc:Depends}
-Provides: ${php:Provides}
-Conflicts: php7.0-thrift, php7.2-thrift
-Replaces: php7.0-thrift, php7.2-thrift
-Description: PHP language support for Thrift
- Thrift is a software framework for the development of reliable and
- performant communication and data serialization. It combines a software
- stack with code generation to build services that operate seamlessly
- across a number of different development languages.
- .
- This package provides the PHP5 language support for Thrift.
+# Package: php-thrift
+# Architecture: any
+# Section: php
+# Depends: ${phpcomposer:Debian-require}, ${shlibs:Depends}, ${misc:Depends}
+# Provides: ${php:Provides}
+# Conflicts: php7.0-thrift, php7.2-thrift
+# Replaces: php7.0-thrift, php7.2-thrift
+# Description: PHP language support for Thrift
+# Thrift is a software framework for the development of reliable and
+# performant communication and data serialization. It combines a software
+# stack with code generation to build services that operate seamlessly
+# across a number of different development languages.
+# .
+# This package provides the PHP5 language support for Thrift.

-Package: libthrift-perl
-Section: perl
-Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}
-Description: Perl language support for Thrift
- Thrift is a software framework for the development of reliable and
- performant communication and data serialization. It combines a software
- stack with code generation to build services that operate seamlessly
- across a number of different development languages.
- .
- This package provides the Perl language support for Thrift.
+# Package: libthrift-perl
+# Section: perl
+# Architecture: all
+# Depends: ${perl:Depends}, ${misc:Depends}
+# Description: Perl language support for Thrift
+# Thrift is a software framework for the development of reliable and
+# performant communication and data serialization. It combines a software
+# stack with code generation to build services that operate seamlessly
+# across a number of different development languages.
+# .
+# This package provides the Perl language support for Thrift.

Package: golang-thrift-dev
Architecture: amd64 arm64 armel armhf i386 ppc64el
diff --git a/debian/rules b/debian/rules
index ba63e6f..8217796 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,7 +47,6 @@ override_dh_auto_clean:
$(CURDIR)/lib/go/test/gopath/src/golang.org/x/net \
$(CURDIR)/lib/go/test/gopath/src/github.com/golang/mock
[ ! -f Makefile ] || $(MAKE) clean
- cd $(CURDIR)/lib/php/src/ext/thrift_protocol/ && phpize --clean
find $(CURDIR) \( -name Makefile -o -name Makefile.in \) -exec rm {} \;
find $(CURDIR) -name .dirstamp -exec rm {} \;
$(RM) aclocal.m4 config.h config.log config.status configure \
@@ -65,10 +64,10 @@ override_dh_auto_clean:

override_dh_auto_configure:
dh_auto_configure -- \
- --with-cpp --with-c_glib --with-php --with-php_extension \
- --with-perl --without-python --with-py3 --without-java \
+ --with-cpp --with-c_glib --without-php --without-php_extension \
+ --without-perl --without-python --with-py3 --without-java \
--without-nodejs --without-erlang --without-lua \
- --with-go --with-ruby \
+ --without-go --without-ruby \
--with-qt4=no --with-qt5=yes \
--without-rust \
--disable-tutorial
--
2.20.1