File tree Expand file tree Collapse file tree 2 files changed +5
-5
lines changed Expand file tree Collapse file tree 2 files changed +5
-5
lines changed Original file line number Diff line number Diff line change 89
89
sed ' /Package: mariadb-plugin-aws-key-management-10.2/,+12d' -i debian/control
90
90
fi
91
91
92
+ # Don't build cassandra package if thrift is not installed
93
+ if [[ ! -f /usr/local/include/thrift/Thrift.h && ! -f /usr/include/thrift/Thrift.h ]]
94
+ then
95
+ sed ' /Package: mariadb-plugin-cassandra/,/^$/d' -i debian/control
96
+ fi
92
97
93
98
# Adjust changelog, add new version
94
99
echo " Incrementing changelog and starting build scripts"
Original file line number Diff line number Diff line change @@ -120,11 +120,6 @@ ifneq ($(ARCH), amd64)
120
120
sed -i -e "/Package: mariadb-plugin-tokudb/,+16d" debian/control
121
121
endif
122
122
123
- # If libthrift-dev was available (manually installed, as it is
124
- # not in Debian) and ha_cassandra.so was thus built, create package,
125
- # otherwise skip it.
126
- [ -f $(BUILDDIR)/storage/cassandra/ha_cassandra.so ] || sed -i -e "/Package: mariadb-plugin-cassandra/,+18d" debian/control
127
-
128
123
# Copy systemd files to a location available for dh_installinit
129
124
cp $(BUILDDIR)/support-files/mariadb.service debian/mariadb-server-10.2.mariadb.service
130
125
cp $(BUILDDIR)/support-files/mariadb@.service debian/mariadb-server-10.2.mariadb@.service
You can’t perform that action at this time.
0 commit comments