[ModemManager/f15] Attempt to figure out why the buildsys hates openpty()
Daniel Williams
dcbw at fedoraproject.org
Wed Jul 6 22:45:41 UTC 2011
commit ca213db2416e74b2bbae73bb9fcb155c5b0772f7
Author: Dan Williams <dcbw at redhat.com>
Date: Wed Jul 6 17:48:44 2011 -0500
Attempt to figure out why the buildsys hates openpty()
ModemManager.spec | 3 +++
blah.patch | 16 ++++++++++++++++
2 files changed, 19 insertions(+), 0 deletions(-)
---
diff --git a/ModemManager.spec b/ModemManager.spec
index 48a2306..3a18f92 100644
--- a/ModemManager.spec
+++ b/ModemManager.spec
@@ -28,6 +28,8 @@ BuildRequires: automake autoconf intltool libtool
# for xsltproc
BuildRequires: libxslt
+Patch0: blah.patch
+
# HACK patch to workaround FTBFS on sparc, type mismatch where
# suseconds_t is int -- Rex
Patch1: ModemManager-0.4-hack_sparc_werror.patch
@@ -38,6 +40,7 @@ modems, including mobile broadband (3G) devices.
%prep
%setup -q
+%patch0 -p1 -b .blah
%patch1 -p1 -b .hack_sparc_werror.patch
%build
diff --git a/blah.patch b/blah.patch
new file mode 100644
index 0000000..cfcce85
--- /dev/null
+++ b/blah.patch
@@ -0,0 +1,16 @@
+diff -up ModemManager-0.4.998/src/tests/test-qcdm-serial-port.c.foo ModemManager-0.4.998/src/tests/test-qcdm-serial-port.c
+--- ModemManager-0.4.998/src/tests/test-qcdm-serial-port.c.foo 2011-07-06 17:46:52.280112601 -0500
++++ ModemManager-0.4.998/src/tests/test-qcdm-serial-port.c 2011-07-06 17:48:28.178913703 -0500
+@@ -404,8 +404,11 @@ test_pty_create (gpointer user_data)
+ GError *error = NULL;
+ gboolean success;
+
++ errno = 0;
+ ret = openpty (&d->master, &d->slave, NULL, NULL, NULL);
+- g_assert (ret == 0);
++ if (ret != 0)
++ g_warning ("%s: openpty() error %d", __func__, errno);
++ g_assert_cmpint (ret, ==, 0);
+ d->valid = TRUE;
+
+ /* set raw mode on the slave using kernel default parameters */
More information about the scm-commits
mailing list