Skip to content

Commit

Permalink
libassa-3.5.1 (rebuild with gcc-12.4.0)
Browse files Browse the repository at this point in the history
  • Loading branch information
fd00 committed Jan 30, 2025
1 parent 26702cd commit 377a78c
Show file tree
Hide file tree
Showing 4 changed files with 92 additions and 86 deletions.
38 changes: 21 additions & 17 deletions libassa/README
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,29 @@ libASSA is an object-oriented C++ networking library based on Adaptive
Communication Patterns.

Runtime requirements:
cygwin-2.9.0-3
libassa3.5-devel-3.5.1-1bl1
libassa3.5_5-3.5.1-1bl1
libgcc1-6.4.0-1
libstdc++6-6.4.0-1
libtirpc-devel-1.0.1-1
libtirpc3-1.0.1-1
pkg-config-0.29.1-1
cygwin-3.5.6-1
libassa3.5-devel-3.5.1-1bl2
libassa3.5_5-3.5.1-1bl2
libgcc1-12.4.0-3
libstdc++6-12.4.0-3
libtirpc-devel-1.3.6-1
libtirpc3-1.3.6-1
pkg-config-2.3.0-1

Build requirements:
(besides corresponding -devel packages)
autoconf-13-1
automake-10-1
binutils-2.29-1
cygport-0.24.1-1
gcc-core-6.4.0-1
gcc-g++-6.4.0-1
libtool-2.4.6-5
make-4.2.1-2
autoconf-15-2
automake-20240607-1
binutils-2.43.1-1
cygport-0.36.9-1
gcc-core-12.4.0-3
gcc-g++-12.4.0-3
libtirpc-devel-1.3.6-1
libtool-2.5.4-1
make-4.4.1-2

Canonical website:
http://libassa.sf.net/
https://sourceforge.net/projects/libassa/

Canonical download:
mirror://sourceforge/libassa/libassa-3.5.1.tar.gz
Expand Down Expand Up @@ -127,6 +128,9 @@ Files included in the binary package:

Port Notes:

----- version 3.5.1-1bl2 -----
Rebuild with gcc-12.4.0

----- version 3.5.1-1bl1 -----
Version bump.

Expand Down
33 changes: 0 additions & 33 deletions libassa/libassa-3.5.1-1bl1.cygport

This file was deleted.

48 changes: 48 additions & 0 deletions libassa/libassa-3.5.1-1bl2.cygport
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
HOMEPAGE="https://sourceforge.net/projects/${PN}/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
PATCH_URI="
https://sources.debian.org/data/main/liba/libassa/3.5.1-8.1/debian/patches/01-include-fixes.diff
https://sources.debian.org/data/main/liba/libassa/3.5.1-8.1/debian/patches/02-fix-spelling-error.patch
https://sources.debian.org/data/main/liba/libassa/3.5.1-8.1/debian/patches/04-fix-more-spelling.patch
https://sources.debian.org/data/main/liba/libassa/3.5.1-8.1/debian/patches/06-link-with-tirpc.diff
"

CATEGORY="Libs"
SUMMARY="C++ networking library based on Adaptive Communication Patterns"
DESCRIPTION="libASSA is an object-oriented C++ networking library based on Adaptive
Communication Patterns."

LICENSE="LGPL-2.0-or-later"
LICENSE_SPDX="SPDX-License-Identifier: LGPL-2.0-or-later"
LICENSE_URI="COPYING"

BUILD_REQUIRES="libtirpc-devel"

export CPPFLAGS="${CPPFLAGS} -DO_ASYNC=0"
export CXXFLAGS="${CXXFLAGS//-Werror=return-type/}"

CYGCONF_ARGS="
--disable-doxygen
--enable-selftests
--enable-examples
"

PKG_NAMES="
${PN}
${PN}3.5_5
${PN}3.5-devel
"
libassa_CONTENTS="
usr/bin/*.exe
usr/share
"
libassa3_5_5_CONTENTS="
usr/bin/cyg*-5.dll
"
libassa3_5_devel_CONTENTS="
usr/include
usr/lib
"
libassa_SUMMARY="${SUMMARY} (utilities)"
libassa3_5_5_SUMMARY="${SUMMARY} (runtime)"
libassa3_5_devel_SUMMARY="${SUMMARY} (development)"
Original file line number Diff line number Diff line change
@@ -1,26 +1,16 @@
--- origsrc/libassa-3.5.1/assa/CommonUtils.h 2006-07-20 11:30:53.000000000 +0900
+++ src/libassa-3.5.1/assa/CommonUtils.h 2017-10-08 00:32:37.444000000 +0900
@@ -14,6 +14,7 @@
#ifndef COMMON_UTILS_H
#define COMMON_UTILS_H

+#include <unistd.h>
#include <sstream>

#include <string>
--- origsrc/libassa-3.5.1/assa/Makefile.am 2012-05-18 11:26:21.000000000 +0900
+++ src/libassa-3.5.1/assa/Makefile.am 2017-10-08 00:20:49.974000000 +0900
@@ -106,7 +106,7 @@ INCLUDES = \
lib_LTLIBRARIES = libassa-3.5.la

libassa_3_5_la_SOURCES = $(h_sources) $(cpp_sources)
-
+libassa_3_5_la_LIBADD = $(TIRPC_LIBS)
libassa_3_5_la_LDFLAGS = \
+++ src/libassa-3.5.1/assa/Makefile.am 2025-01-29 22:31:22.966424900 +0900
@@ -111,6 +111,8 @@ libassa_3_5_la_LDFLAGS = \
@WIN32_EXTRA_LDFLAGS@ \
-version-info @LIBASSA_SO_VERSION@

+libassa_3_5_la_LIBADD = $(TIRPC_LIBS)
+
# Disable autoheader.
AUTOHEADER=echo

--- origsrc/libassa-3.5.1/assa/Socket.cpp 2006-09-25 02:35:33.000000000 +0900
+++ src/libassa-3.5.1/assa/Socket.cpp 2017-10-08 00:10:10.723000000 +0900
+++ src/libassa-3.5.1/assa/Socket.cpp 2025-01-29 19:55:17.378170300 +0900
@@ -15,7 +15,7 @@
//------------------------------------------------------------------------

Expand All @@ -30,22 +20,8 @@
# include <sys/ioctl.h>
#endif

@@ -734,11 +734,11 @@ decode_fcntl_flags (long mask_)
if (mask_ & O_SYNC) {
answer += "O_SYNC|"; // 010000
}
-
+#if defined(O_ASYNC)
if (mask_ & O_ASYNC) { // 020000
answer += "O_ASYNC|";
}
-
+#endif
answer.erase (answer.end () - 1);

#endif
--- origsrc/libassa-3.5.1/configure.ac 2012-05-23 11:52:25.000000000 +0900
+++ src/libassa-3.5.1/configure.ac 2017-10-08 00:13:18.192000000 +0900
+++ src/libassa-3.5.1/configure.ac 2025-01-29 19:56:00.762123500 +0900
@@ -154,7 +154,7 @@ AC_SUBST(LIBRPC)
AC_MSG_CHECKING([for win32 environment... ])
case "$host_os" in
Expand All @@ -56,7 +32,7 @@
AC_MSG_RESULT([found cygwin: added -no-undefined to LDFLAGS])
;;
--- origsrc/libassa-3.5.1/doc/Makefile.am 2012-05-23 11:29:08.000000000 +0900
+++ src/libassa-3.5.1/doc/Makefile.am 2017-10-08 00:01:34.663000200 +0900
+++ src/libassa-3.5.1/doc/Makefile.am 2025-01-29 19:56:25.221529600 +0900
@@ -28,9 +28,9 @@ install-reference: html/index.html
basefile=`echo $$file | sed -e 's,^.*/,,'`; \
${INSTALL_DATA} $$file ${DESTDIR}${docdir}/html/$$basefile; \
Expand All @@ -71,7 +47,7 @@

uninstall-reference: html/index.html
--- origsrc/libassa-3.5.1/tests/Makefile.am 2012-05-23 11:52:25.000000000 +0900
+++ src/libassa-3.5.1/tests/Makefile.am 2017-10-08 00:01:54.566000000 +0900
+++ src/libassa-3.5.1/tests/Makefile.am 2025-01-29 19:56:48.040483300 +0900
@@ -20,7 +20,7 @@ AM_CPPFLAGS = -I$(top_srcdir)
# Choose static libraries where possible.
# Try to create a completely statically linked executable
Expand All @@ -81,3 +57,14 @@

LDADD = \
$(top_builddir)/assa/libassa-@ASSA_RELEASE@.la \
--- origsrc/libassa-3.5.1/tests/ttcp_assa.cpp 2008-09-13 03:59:26.000000000 +0900
+++ src/libassa-3.5.1/tests/ttcp_assa.cpp 2025-01-29 23:01:10.230241600 +0900
@@ -479,7 +479,7 @@ int main (int argc, char** argv)
exit(0);

usage:
- fprintf(stderr,Usage);
+ fprintf(stderr,"%s", Usage);
exit(1);

#endif /* !defined WIN32 */

0 comments on commit 377a78c

Please sign in to comment.